Zend Feed refactoring WIP

Author: ldusan84

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

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\App;
 
+use \Magento\Framework\App\FeedInterface;
+
 class Feed implements \Magento\Framework\App\FeedInterface
 {
     /**
@@ -26,9 +28,9 @@ public function __construct(\Zend_Feed_Abstract $feed)
      * @return string
      */
     public function getFormatedContentAs(
-        $format = FeedOutputFormatsInterface::DEFAULT_FORMAT
+        $format = FeedInterface::DEFAULT_FORMAT
     ) {
-        if ($format === FeedOutputFormatsInterface::DEFAULT_FORMAT) {
+        if ($format === FeedInterface::DEFAULT_FORMAT) {
             return $this->feed->saveXml();
         }
         throw new \Magento\Framework\Exception\RuntimeException(

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

@@ -6,12 +6,13 @@
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\FeedFactory;
+use Magento\Framework\App\FeedFactoryInterface;
 use Psr\Log\LoggerInterface;
 
 /**
  * Feed factory
  */
-class FeedFactory implements \Magento\Framework\App\FeedFactoryInterface
+class FeedFactory implements FeedFactoryInterface
 {
     /**
      * @var \Zend_Feed
@@ -38,18 +39,20 @@ public function __construct(
     /**
      * Get a new \Magento\Framework\App\Feed object from a custom array
      *
-     * @throws \Magento\Framework\Exception\RuntimeException
+     * @throws \Magento\Framework\Exception\InputException
      * @param  array  $data
      * @param  string $format
      * @return \Magento\Framework\App\FeedInterface
      */
-    public function importArray(array $data, $format = FeedFormatsInterface::DEFAULT_FORMAT)
-    {
+    public function create(
+        array $data, 
+        $format = FeedFactoryInterface::DEFAULT_FORMAT
+    ) {
         try {
             return $this->feedProcessor->importArray($data, $format);
         } catch (\Zend_Feed_Exception $e) {
             $this->logger->error($e->getMessage());
-            throw new \Magento\Framework\Exception\RuntimeException(
+            throw new \Magento\Framework\Exception\InputException(
                 __('There has been an error with import'),
                 $e
             );

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

@@ -8,6 +8,8 @@
 interface FeedFactoryInterface
 {
 
+    const DEFAULT_FORMAT = 'rss';
+
     /**
      * Returns FeedInterface object from a custom array
      * 
@@ -16,8 +18,8 @@ interface FeedFactoryInterface
      * @param  string $format
      * @return FeedInterface
      */
-    public function importArray(
+    public function create(
         array $data, 
-        $format = FeedFormatsInterface::DEFAULT_FORMAT
+        $format = self::DEFAULT_FORMAT
     );
 }

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

@@ -7,10 +7,12 @@
 
 interface FeedInterface
 {
+    const DEFAULT_FORMAT = 'xml';
+
     /**
      * @return string
      */
     public function getFormatedContentAs(
-        $format = FeedOutputFormatsInterface::DEFAULT_FORMAT
+        $format = self::DEFAULT_FORMAT
     );
 }