Zend Feed refactoring WIP

Author: ldusan84

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

@@ -8,6 +8,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Rss\DataProviderInterface;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\App\FeedInterface;
 use Magento\Framework\App\FeedFactoryInterface;
 
 /**
@@ -101,13 +102,13 @@ public function setDataProvider(DataProviderInterface $dataProvider)
      */
     public function createRssXml()
     {
-        $feed = $this->feedFactory->importArray(
+        $feed = $this->feedFactory->create(
             $this->getFeeds(), 
-            \Magento\Framework\App\FeedFormatsInterface::DEFAULT_FORMAT
+            FeedFactoryInterface::DEFAULT_FORMAT
         );
 
-        return $feed->getFormatedContentAs(
-            \Magento\Framework\App\FeedOutputFormatsInterface::DEFAULT_FORMAT
+        return $feed->getFormattedContentAs(
+            FeedInterface::DEFAULT_FORMAT
         );
     }
 }

app/etc/di.xml

@@ -174,6 +174,11 @@
     <preference for="Magento\Framework\App\FeedInterface" type="Magento\Framework\App\Feed" />
     <preference for="Magento\Framework\App\FeedFactoryInterface" type="Magento\Framework\App\FeedFactory" />
     <preference for="Magento\Framework\Indexer\Config\DependencyInfoProviderInterface" type="Magento\Framework\Indexer\Config\DependencyInfoProvider" />
+    <type name="Magento\Framework\Acl\Data\Cache">
+        <arguments>
+            <argument name="aclBuilder" xsi:type="object">Magento\Framework\Acl\Builder\Proxy</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Acl\Data\Cache">
         <arguments>
@@ -243,6 +248,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\FeedFactory">
+        <arguments>
+            <argument name="formats" xsi:type="array">
+                <item name="rss" xsi:type="string">Magento\Framework\App\Feed</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Session\SaveHandler\Redis">
         <arguments>
             <argument name="config" xsi:type="object">Cm\RedisSession\Handler\ConfigInterface</argument>

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

@@ -5,37 +5,35 @@
  */
 namespace Magento\Framework\App;
 
-use \Magento\Framework\App\FeedInterface;
-
-class Feed implements \Magento\Framework\App\FeedInterface
+/**
+ * Default XML feed class
+ */
+class Feed implements FeedInterface
 {
     /**
-     * @var \Zend_Feed_Abstract
+     * @param Zend_Feed $feed
+     * @param array $data
      */
-    private $feed;
-
-    /**
-     * @param \Zend_Feed_Abstract $feed
-     */
-    public function __construct(\Zend_Feed_Abstract $feed)
-    {
-        $this->feed = $feed;
+    public function __construct(
+        \Zend_Feed $feed,
+        array $data
+    ) {
+       $this->feed = $feed;
+       $this->data = $data;
     }
 
     /**
-     * Get the xml from Zend_Feed_Abstract object
-     *
+     * Returns the formatted feed content
+     * 
      * @return string
      */
     public function getFormatedContentAs(
-        $format = FeedInterface::DEFAULT_FORMAT
+        $format = self::DEFAULT_FORMAT
     ) {
-        if ($format === FeedInterface::DEFAULT_FORMAT) {
-            return $this->feed->saveXml();
-        }
-        throw new \Magento\Framework\Exception\RuntimeException(
-            __('Given feed format is not supported'),
-            $e
+        $feed = $this->feed::importArray(
+            $this->data, 
+            FeedFactoryInterface::DEFAULT_FORMAT
         );
+        return $this->feed->saveXml();
     }
-}
+}

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

@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\App;
 
-use Magento\Framework\App\FeedFactory;
 use Magento\Framework\App\FeedFactoryInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -15,7 +15,7 @@
 class FeedFactory implements FeedFactoryInterface
 {
     /**
-     * @var \Zend_Feed
+     * @var FeedProcessorInterface
      */
     private $feedProcessor;
 
@@ -25,19 +25,27 @@ class FeedFactory implements FeedFactoryInterface
     private $logger;
 
     /**
-     * @param \Zend_Feed $feedProcessor
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManger
      * @param LoggerInterface $logger
+     * @param array $formats
      */
     public function __construct(
-        \Zend_Feed $feedProcessor,
-        LoggerInterface $logger
+        ObjectManagerInterface $objectManger,
+        LoggerInterface $logger,
+        array $formats
     ) {
-        $this->feedProcessor = $feedProcessor;
+        $this->objectManager = $objectManger;
         $this->logger = $logger;
+        $this->formats = $formats;
     }
 
     /**
-     * Get a new \Magento\Framework\App\Feed object from a custom array
+     * Get a new \Magento\Framework\App\FeedInterface object from a custom array
      *
      * @throws \Magento\Framework\Exception\InputException
      * @param  array  $data
@@ -48,9 +56,18 @@ public function create(
         array $data, 
         $format = FeedFactoryInterface::DEFAULT_FORMAT
     ) {
+        if (!isset($this->formats[$format])) {
+            throw new \Magento\Framework\Exception\InputException(
+                __('The format is not supported'),
+                $e
+            );
+        }
         try {
-            return $this->feedProcessor->importArray($data, $format);
-        } catch (\Zend_Feed_Exception $e) {
+            return $this->objectManager->create(
+                $this->formats[$format],
+                $data
+            );
+        } catch (\Exception $e) {
             $this->logger->error($e->getMessage());
             throw new \Magento\Framework\Exception\InputException(
                 __('There has been an error with import'),

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

@@ -13,7 +13,7 @@ interface FeedFactoryInterface
     /**
      * Returns FeedInterface object from a custom array
      * 
-     * @throws \Magento\Framework\Exception\RuntimeException
+     * @throws \Magento\Framework\Exception\InputException
      * @param  array  $data
      * @param  string $format
      * @return FeedInterface

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

@@ -12,7 +12,7 @@ interface FeedInterface
     /**
      * @return string
      */
-    public function getFormatedContentAs(
+    public function getFormattedContentAs(
         $format = self::DEFAULT_FORMAT
     );
 }