merge magento/2.3-develop into magento-thunder/MAGETWO-89229

Magento CICD · web-flow · commit 8f2b6585761b · 2018-03-15T09:10:40.000-07:00
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
+[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
diff --git a/app/code/Magento/Rss/Model/Rss.php b/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 Zend\Feed\Writer\FeedFactory;
 
 /**
  * Provides functionality to work with RSS feeds
@@ -92,7 +93,7 @@ public function setDataProvider(DataProviderInterface $dataProvider)
      */
     public function createRssXml()
     {
-        $rssFeedFromArray = \Zend_Feed::importArray($this->getFeeds(), 'rss');
-        return $rssFeedFromArray->saveXML();
+        $feed = FeedFactory::factory($this->getFeeds());
+        return $feed->export('rss');
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Rss\Test\Unit\Controller\Adminhtml\Feed;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Zend\Feed\Writer\Exception\InvalidArgumentException;
 
 /**
  * Class IndexTest
@@ -110,7 +111,7 @@ public function testExecuteWithException()
         $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));
         $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));
 
-        $this->expectException('\Zend_Feed_Builder_Exception');
+        $this->expectException(InvalidArgumentException::class);
         $this->controller->execute();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Rss\Test\Unit\Controller\Feed;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Zend\Feed\Writer\Exception\InvalidArgumentException;
 
 /**
  * Class IndexTest
@@ -97,7 +98,7 @@ public function testExecuteWithException()
         $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));
         $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));
 
-        $this->expectException('\Zend_Feed_Builder_Exception');
+        $this->expectException(InvalidArgumentException::class);
         $this->controller->execute();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
@@ -119,11 +119,11 @@ public function testCreateRssXml()
         $this->rss->setDataProvider($dataProvider);
         $result = $this->rss->createRssXml();
         $this->assertContains('<?xml version="1.0" encoding="UTF-8"?>', $result);
-        $this->assertContains('<title><![CDATA[Feed Title]]></title>', $result);
-        $this->assertContains('<title><![CDATA[Feed 1 Title]]></title>', $result);
+        $this->assertContains('<title>Feed Title</title>', $result);
+        $this->assertContains('<title>Feed 1 Title</title>', $result);
         $this->assertContains('<link>http://magento.com/rss/link</link>', $result);
         $this->assertContains('<link>http://magento.com/rss/link/id/1</link>', $result);
-        $this->assertContains('<description><![CDATA[Feed Description]]></description>', $result);
+        $this->assertContains('<description>Feed Description</description>', $result);
         $this->assertContains('<description><![CDATA[Feed 1 Description]]></description>', $result);
     }
 }
diff --git a/composer.json b/composer.json
@@ -59,6 +59,7 @@
         "zendframework/zend-db": "^2.8.2",
         "zendframework/zend-di": "^2.6.1",
         "zendframework/zend-eventmanager": "^2.6.3",
+        "zendframework/zend-feed": "^2.9.0",
         "zendframework/zend-form": "^2.10.0",
         "zendframework/zend-http": "^2.6.0",
         "zendframework/zend-i18n": "^2.7.3",
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -4220,4 +4220,5 @@
     ['Magento\Framework\MessageQueue\Config\Reader', 'Magento\Framework\MessageQueue\Config\Reader\Xml'],
     ['Magento\Framework\MessageQueue\PublisherFactory'],
     ['Magento\Framework\MessageQueue\PublisherProxy'],
+    ['Zend_Feed', 'Zend\Feed'],
 ];
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
@@ -107,5 +107,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // we must have an exit code higher than zero to indicate something was wrong
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php
@@ -99,6 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 . '</info>'
             );
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractModuleManageCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractModuleManageCommand.php
@@ -12,6 +12,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Module\Status;
+use Magento\Framework\Console\Cli;
 
 abstract class AbstractModuleManageCommand extends AbstractModuleCommand
 {
@@ -77,14 +78,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!empty($messages)) {
             $output->writeln(implode(PHP_EOL, $messages));
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
         try {
             $modulesToChange = $this->getStatus()->getModulesToChange($isEnable, $modules);
         } catch (\LogicException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
         if (!empty($modulesToChange)) {
             $force = $input->getOption(self::INPUT_KEY_FORCE);
@@ -96,7 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     );
                     $output->writeln('<error>' . implode("</error>\n<error>", $constraints) . '</error>');
                     // we must have an exit code higher than zero to indicate something was wrong
-                    return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+                    return Cli::RETURN_FAILURE;
                 }
             }
             $this->setIsEnabled($isEnable, $modulesToChange, $output);
@@ -111,6 +112,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $output->writeln('<info>No modules were changed.</info>');
         }
+        return Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
@@ -159,6 +159,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output->writeln(
             '<info>Created Magento administrator user named ' . $input->getOption(AdminAccount::KEY_USER) . '</info>'
         );
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
@@ -126,6 +126,7 @@ function ($value) {
                 $output->writeln('<info>You made no changes to the configuration.</info>');
             }
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/DbDataUpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/DbDataUpgradeCommand.php
@@ -67,5 +67,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $installer = $this->installFactory->create(new ConsoleLogger($output));
         $installer->installDataFixtures();
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/DbSchemaUpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/DbSchemaUpgradeCommand.php
@@ -81,6 +81,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $installer = $this->installFactory->create(new ConsoleLogger($output));
         $installer->installSchema($input->getOptions());
-        return null;
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
@@ -21,6 +21,7 @@
 use Magento\Setup\Module\Di\App\Task\OperationInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
+use Magento\Framework\Console\Cli;
 
 /**
  * Command to run compile in single-tenant mode
@@ -141,7 +142,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($line);
             }
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
 
         $modulePaths = $this->componentRegistrar->getPaths(ComponentRegistrar::MODULE);
@@ -211,8 +212,9 @@ function (OperationInterface $operation) use ($progressBar) {
         } catch (OperationException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
+        return Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php b/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php
@@ -133,6 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // we must have an exit code higher than zero to indicate something was wrong
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php b/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php
@@ -77,5 +77,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $input->getOption(self::INPUT_KEY_MAGENTO)
         );
         $output->writeln('<info>Dictionary successfully processed.</info>');
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/I18nPackCommand.php b/setup/src/Magento/Setup/Console/Command/I18nPackCommand.php
@@ -91,5 +91,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $input->getOption(self::INPUT_KEY_ALLOW_DUPLICATES)
         );
         $output->writeln("<info>Successfully saved $locale language package.</info>");
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoAdminUriCommand.php b/setup/src/Magento/Setup/Console/Command/InfoAdminUriCommand.php
@@ -53,5 +53,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             . $this->deploymentConfig->get(BackendConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME)
             . "\n"
         );
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
@@ -87,7 +87,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
             if (empty($tempTable)) {
                 $output->writeln('<info>No backup files found.</info>');
-                return;
+                return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
             }
             $output->writeln("<info>Showing backup files in $backupsDir.</info>");
             /** @var \Symfony\Component\Console\Helper\Table $table */
@@ -101,5 +101,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $output->writeln('<info>No backup files found.</info>');
         }
+
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
@@ -56,5 +56,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $table->render($output);
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
@@ -56,5 +56,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $table->render($output);
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
@@ -56,5 +56,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $table->render($output);
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InstallStoreConfigurationCommand.php b/setup/src/Magento/Setup/Console/Command/InstallStoreConfigurationCommand.php
@@ -127,6 +127,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $installer = $this->installerFactory->create(new ConsoleLogger($output));
         $installer->installUserConfig($input->getOptions());
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php b/setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php
@@ -111,6 +111,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->maintenanceMode->setAddresses('');
             $output->writeln('<info>Set exempt IP-addresses: none</info>');
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php b/setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php
@@ -56,5 +56,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $addressInfo = $this->maintenanceMode->getAddressInfo();
         $addresses = implode(' ', $addressInfo);
         $output->writeln('<info>List of exempt IP-addresses: ' . ($addresses ? $addresses : 'none') . '</info>');
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
@@ -65,5 +65,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $output->writeln(join("\n", $disabledModules));
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php
diff --git a/setup/src/Magento/Setup/Console/Command/UninstallCommand.php b/setup/src/Magento/Setup/Console/Command/UninstallCommand.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)`
	`2`	`+[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)`
`2`	`3`	`[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)`
`3`	`4`	`[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)`
`4`	`5`	`<h2>Welcome</h2>`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`use Magento\Framework\App\ObjectManager;`
`9`	`9`	`use Magento\Framework\App\Rss\DataProviderInterface;`
`10`	`10`	`use Magento\Framework\Serialize\SerializerInterface;`
	`11`	`+use Zend\Feed\Writer\FeedFactory;`
`11`	`12`
`12`	`13`	`/**`
`13`	`14`	`* Provides functionality to work with RSS feeds`
`@@ -92,7 +93,7 @@ public function setDataProvider(DataProviderInterface $dataProvider)`
`92`	`93`	`*/`
`93`	`94`	`public function createRssXml()`
`94`	`95`	`{`
`95`		`- $rssFeedFromArray = \Zend_Feed::importArray($this->getFeeds(), 'rss');`
`96`		`- return $rssFeedFromArray->saveXML();`
	`96`	`+ $feed = FeedFactory::factory($this->getFeeds());`
	`97`	`+ return $feed->export('rss');`
`97`	`98`	`}`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`namespace Magento\Rss\Test\Unit\Controller\Adminhtml\Feed;`
`7`	`7`
`8`	`8`	`use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;`
	`9`	`+use Zend\Feed\Writer\Exception\InvalidArgumentException;`
`9`	`10`
`10`	`11`	`/**`
`11`	`12`	`* Class IndexTest`
`@@ -110,7 +111,7 @@ public function testExecuteWithException()`
`110`	`111`	`$this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));`
`111`	`112`	`$this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));`
`112`	`113`
`113`		`- $this->expectException('\Zend_Feed_Builder_Exception');`
	`114`	`+ $this->expectException(InvalidArgumentException::class);`
`114`	`115`	`$this->controller->execute();`
`115`	`116`	`}`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,5 +107,6 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`107`	`107`	`// we must have an exit code higher than zero to indicate something was wrong`
`108`	`108`	`return \Magento\Framework\Console\Cli::RETURN_FAILURE;`
`109`	`109`	`}`
	`110`	`+ return \Magento\Framework\Console\Cli::RETURN_SUCCESS;`
`110`	`111`	`}`
`111`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`99`	`99`	`. '</info>'`
`100`	`100`	`);`
`101`	`101`	`}`
	`102`	`+ return \Magento\Framework\Console\Cli::RETURN_SUCCESS;`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`/**`