#9347: Zend feed refactoring

 - Minor fixes per CR

Author: ishakhsuvarov

app/code/Magento/Rss/Model/Rss.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\Rss\DataProviderInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\App\FeedFactoryInterface;
+use Magento\Framework\App\FeedInterface;
 
 /**
  * Provides functionality to work with RSS feeds
@@ -101,13 +102,7 @@ public function setDataProvider(DataProviderInterface $dataProvider)
      */
     public function createRssXml()
     {
-        $feed = $this->feedFactory->create(
-            $this->getFeeds(),
-            \Magento\Framework\App\FeedFactoryInterface::DEFAULT_FORMAT
-        );
-
-        return $feed->getFormatedContentAs(
-            \Magento\Framework\App\FeedInterface::DEFAULT_FORMAT
-        );
+        $feed = $this->feedFactory->create($this->getFeeds(), FeedFactoryInterface::DEFAULT_FORMAT);
+        return $feed->getFormattedContentAs(FeedInterface::DEFAULT_FORMAT);
     }
 }

app/code/Magento/Rss/Test/Unit/Model/RssTest.php

@@ -152,7 +152,7 @@ public function testCreateRssXml()
         $dataProvider->expects($this->any())->method('getRssData')->will($this->returnValue($this->feedData));
 
         $this->feedMock->expects($this->once())
-            ->method('getFormatedContentAs')
+            ->method('getFormattedContentAs')
             ->with(\Magento\Framework\App\FeedInterface::DEFAULT_FORMAT)
             ->will($this->returnValue($this->feedXml));
 

lib/internal/Magento/Framework/App/Feed.php

@@ -5,7 +5,8 @@
  */
 namespace Magento\Framework\App;
 
-use \Magento\Framework\App\FeedInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\Exception\InputException;
 
 class Feed implements \Magento\Framework\App\FeedInterface
 {
@@ -25,17 +26,17 @@ public function __construct(\Zend_Feed_Abstract $feed)
     /**
      * Get the xml from Zend_Feed_Abstract object
      *
+     * @param string $format
      * @return string
+     * @throws InputException
      */
-    public function getFormatedContentAs(
-        $format = FeedInterface::DEFAULT_FORMAT
-    ) {
+    public function getFormattedContentAs(string $format = FeedInterface::DEFAULT_FORMAT): string
+    {
         if ($format === FeedInterface::DEFAULT_FORMAT) {
             return $this->feed->saveXml();
         }
-        throw new \Magento\Framework\Exception\RuntimeException(
-            __('Given feed format is not supported'),
-            $e
+        throw new InputException(
+            new Phrase('Given feed format is not supported')
         );
     }
 }

lib/internal/Magento/Framework/App/FeedInterface.php

@@ -10,9 +10,8 @@ interface FeedInterface
     const DEFAULT_FORMAT = 'xml';
 
     /**
+     * @param string $format
      * @return string
      */
-    public function getFormatedContentAs(
-        $format = self::DEFAULT_FORMAT
-    );
+    public function getFormattedContentAs(string $format = self::DEFAULT_FORMAT): string;
 }