Merge pull request #243 from leonghui/add-jsonfeed-icon

Add support for Icon in JSON feed
alexdebril · Nov 27, 2019 · e0e5234 · e0e5234
2 parents 52eb1b3 + 232540e
commit e0e5234
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/src/FeedIo/Formatter/JsonFormatter.php b/src/FeedIo/Formatter/JsonFormatter.php
@@ -39,6 +39,7 @@ public function toArray(FeedInterface $feed) : array
             'home_page_url' => $feed->getLink(),
             'feed_url' => $feed->getUrl(),
             'id' => $feed->getPublicId(),
+            'icon' => $feed->getLogo(),
             'items' => iterator_to_array($this->itemsToArray($feed)),
         ]);
     }

diff --git a/src/FeedIo/Parser/JsonParser.php b/src/FeedIo/Parser/JsonParser.php
@@ -31,6 +31,7 @@ public function parseContent(Document $document, FeedInterface $feed) : FeedInte
         $feed->setDescription($this->readOffset($data, 'description'));
         $feed->setLink($this->readOffset($data, 'feed_url'));
         $feed->setUrl($this->readOffset($data, 'home_page_url'));
+        $feed->setLogo($this->readOffset($data, 'icon'));
 
         if (array_key_exists('items', $data)) {
             $this->parseItems($data['items'], $feed);

diff --git a/tests/FeedIo/JsonFormatterTest.php b/tests/FeedIo/JsonFormatterTest.php
@@ -18,6 +18,9 @@
 
 class JsonFormatterTest extends TestCase
 {
+
+    const LOGO = 'http://localhost/logo.jpeg';
+
     public function testToString()
     {
         $items = [
@@ -27,6 +30,7 @@ public function testToString()
 
         $feed = new Feed();
         $feed->setTitle('feed title');
+        $feed->setLogo(self::LOGO);
 
         foreach ($items as $item) {
             $feed->add($item);
@@ -39,6 +43,7 @@ public function testToString()
         $json = json_decode($string, true);
 
         $this->assertEquals('feed title', $json['title']);
+        $this->assertEquals('http://localhost/logo.jpeg', $json['icon']);
         $this->assertCount(2, $json['items']);
 
         foreach ($json['items'] as $item) {

diff --git a/tests/FeedIo/Parser/JsonParserTest.php b/tests/FeedIo/Parser/JsonParserTest.php
@@ -32,7 +32,8 @@ public function testParseContent()
         $parser->parse($this->getDocument(), $feed);
 
         $this->assertEquals('JSON Feed', $feed->getTitle());
-
+        $this->assertEquals('https://jsonfeed.org/graphics/icon.png', $feed->getLogo());
+
         $items = $feed->toArray()['items'];
 
         $this->assertCount(4, $items);

diff --git a/tests/samples/feed.json b/tests/samples/feed.json
@@ -6,6 +6,7 @@
   "feed_url": "https://jsonfeed.org/feed.json",
   "user_comment": "This feed allows you to read the posts from this site in any feed reader that supports the JSON Feed format. To add this feed to your reader, copy the following URL — https://jsonfeed.org/feed.json — and add it your reader.",
   "favicon": "https://jsonfeed.org/graphics/icon.png",
+  "icon" : "https://jsonfeed.org/graphics/icon.png",
   "author": {
     "name": "Brent Simmons and Manton Reece"
   },