PR-155-For-2 4-develop

Author: akaplya

app/code/Magento/Catalog/Helper/Image.php

@@ -13,11 +13,10 @@
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 /**
- * Catalog image helper.
+ * Catalog image helper
  *
  * @api
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
 class Image extends AbstractHelper implements ArgumentInterface
@@ -164,7 +163,8 @@ public function __construct(
         $this->_assetRepo = $assetRepo;
         $this->viewConfig = $viewConfig;
         $this->viewAssetPlaceholderFactory = $placeholderFactory
-            ?: ObjectManager::getInstance()->get(PlaceholderFactory::class);
+            ?: ObjectManager::getInstance()
+                ->get(PlaceholderFactory::class);
         $this->mediaConfig = $mediaConfig ?: ObjectManager::getInstance()->get(CatalogMediaConfig::class);
     }
 

app/code/Magento/Catalog/Model/Config/Source/Web/CatalogMediaUrlFormat.php

@@ -24,7 +24,7 @@ public function toOptionArray()
                 'value' => CatalogMediaConfig::IMAGE_OPTIMIZATION_PARAMETERS,
                 'label' => __('Image optimization based on query parameters')
             ],
-            ['value' => CatalogMediaConfig::HASH, 'label' => __('Unique hash per image variant (Legacy mode)')]
+            ['value' => CatalogMediaConfig::HASH, 'label' => __('Legacy mode (unique hash per image variant)')]
         ];
     }
 }

app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php

@@ -86,8 +86,7 @@ protected function configure()
         $this->setName('catalog:images:resize')
             ->setDescription(
                 'Creates resized product images ' .
-                '(Not relevant when image resizing is offloaded from Magento. ' .
-                'See https://docs.magento.com/m2/ee/user_guide/configuration/general/web.html#url-options )'
+                '(Deprecated: see https://docs.magento.com/m2/ee/user_guide/configuration/general/web.html#url-options'
             )
             ->setDefinition($this->getOptionsList());
     }