merge magento/2.2-develop into magento-performance/MAGETWO-88775

Magento CICD · web-flow · commit 5cd8295745d4 · 2018-03-21T03:12:45.000-07:00
diff --git a/app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php b/app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php
@@ -70,7 +70,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $productIds = $productCollection->getAllIds();
         if (!count($productIds)) {
             $output->writeln("<info>No product images to resize</info>");
-            // we must have an exit code higher than zero to indicate something was wrong
             return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
         }
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
@@ -140,7 +140,7 @@ public function getDefaultStoreId()
      *
      * @param string $table
      * @param array|int $attributeIds
-     * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
+     * @return \Magento\Framework\DB\Select
      */
     protected function _getLoadAttributesSelect($table, $attributeIds = [])
     {

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`70`	`70`	`$productIds = $productCollection->getAllIds();`
`71`	`71`	`if (!count($productIds)) {`
`72`	`72`	`$output->writeln("<info>No product images to resize</info>");`
`73`		`- // we must have an exit code higher than zero to indicate something was wrong`
`74`	`73`	`return \Magento\Framework\Console\Cli::RETURN_SUCCESS;`
`75`	`74`	`}`
`76`	`75`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public function getDefaultStoreId()`
`140`	`140`	`*`
`141`	`141`	`* @param string $table`
`142`	`142`	`* @param array\|int $attributeIds`
`143`		`- * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection`
	`143`	`+ * @return \Magento\Framework\DB\Select`
`144`	`144`	`*/`
`145`	`145`	`protected function _getLoadAttributesSelect($table, $attributeIds = [])`
`146`	`146`	`{`