🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests: - #14189: fix incorrect phpdoc return type (by @EliasZ) - #14154: catalog:images:resize CLI command fix (by @nfourteen)
magento · Mar 21, 2018 · 5afa7d3 · 5afa7d3
2 parents 124d8fe + 79e72bc
commit 5afa7d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
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 = [])
     {