MAGETWO-65251: [Backport] - [Performance] Image resize mechanism does not generate images of all necessary sizes - for 2.1.6

Author: zakdma

app/code/Magento/Catalog/Model/Product/Image.php

@@ -199,6 +199,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\Catalog\Model\View\Asset\ImageFactory $assetImageFactory
+     * @param \Magento\Catalog\Model\View\Asset\PlaceholderFactory $assetPlaceholderFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
@@ -215,7 +217,9 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Catalog\Model\View\Asset\ImageFactory $assetImageFactory = null,
+        \Magento\Catalog\Model\View\Asset\PlaceholderFactory $assetPlaceholderFactory = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_catalogProductMediaConfig = $catalogProductMediaConfig;
@@ -226,6 +230,18 @@ public function __construct(
         $this->_assetRepo = $assetRepo;
         $this->_viewFileSystem = $viewFileSystem;
         $this->_scopeConfig = $scopeConfig;
+        $this->viewAssetImageFactory = $assetImageFactory;
+        if ($this->viewAssetImageFactory == null) {
+            $this->viewAssetImageFactory = ObjectManager::getInstance()->get(
+                \Magento\Catalog\Model\View\Asset\ImageFactory::class
+            );
+        }
+        $this->viewAssetPlaceholderFactory = $assetPlaceholderFactory;
+        if ($this->viewAssetPlaceholderFactory == null) {
+            $this->viewAssetPlaceholderFactory = ObjectManager::getInstance()->get(
+                \Magento\Catalog\Model\View\Asset\PlaceholderFactory::class
+            );
+        }
     }
 
     /**
@@ -469,7 +485,7 @@ public function setBaseFile($file)
     {
         $this->_isBaseFilePlaceholder = false;
 
-        $this->imageAsset = $this->getViewAssetImageFactory()->create(
+        $this->imageAsset = $this->viewAssetImageFactory->create(
             [
                 'miscParams' => $this->getMiscParams(),
                 'filePath' => $file,
@@ -479,7 +495,7 @@ public function setBaseFile($file)
             || !$this->_checkMemory($this->imageAsset->getSourceFile())
         ) {
             $this->_isBaseFilePlaceholder = true;
-            $this->imageAsset = $this->getViewAssetPlaceholderFactory()->create(
+            $this->imageAsset = $this->viewAssetPlaceholderFactory->create(
                 [
                     'type' => $this->getDestinationSubdir(),
                 ]
@@ -895,38 +911,6 @@ public function getResizedImageInfo()
         return getimagesize($image);
     }
 
-    /**
-     * Get assets ImageFactory object
-     *
-     * @return \Magento\Catalog\Model\View\Asset\ImageFactory
-     */
-    private function getViewAssetImageFactory()
-    {
-        if ($this->viewAssetImageFactory == null) {
-            $this->viewAssetImageFactory = ObjectManager::getInstance()->get(
-                \Magento\Catalog\Model\View\Asset\ImageFactory::class
-            );
-        }
-
-        return $this->viewAssetImageFactory;
-    }
-
-    /**
-     * Get assets PlaceholderFactory object
-     *
-     * @return \Magento\Catalog\Model\View\Asset\PlaceholderFactory
-     */
-    private function getViewAssetPlaceholderFactory()
-    {
-        if ($this->viewAssetPlaceholderFactory == null) {
-            $this->viewAssetPlaceholderFactory = ObjectManager::getInstance()->get(
-                \Magento\Catalog\Model\View\Asset\PlaceholderFactory::class
-            );
-        }
-
-        return $this->viewAssetPlaceholderFactory;
-    }
-
     /**
      * Retrieve misc params based on all image attributes
      *

app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php

@@ -132,6 +132,17 @@ protected function setUp()
         $context = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
             ->disableOriginalConstructor()
             ->getMock();
+
+        $this->viewAssetImageFactory = $this->getMockBuilder(ImageFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->viewAssetPlaceholderFactory = $this->getMockBuilder(PlaceholderFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
         $this->image = new \Magento\Catalog\Model\Product\Image(
             $context,
             $this->registry,
@@ -142,8 +153,14 @@ protected function setUp()
             $this->factory,
             $this->repository,
             $this->fileSystem,
-            $this->scopeConfigInterface
+            $this->scopeConfigInterface,
+            null,
+            null,
+            [],
+            $this->viewAssetImageFactory,
+            $this->viewAssetPlaceholderFactory
         );
+
         //Settings for backward compatible property
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->imageAsset = $this->getMockBuilder(\Magento\Framework\View\Asset\LocalInterface::class)
@@ -153,26 +170,6 @@ protected function setUp()
             'imageAsset',
             $this->imageAsset
         );
-
-        $this->viewAssetImageFactory = $this->getMockBuilder(ImageFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $objectManagerHelper->setBackwardCompatibleProperty(
-            $this->image,
-            'viewAssetImageFactory',
-            $this->viewAssetImageFactory
-        );
-
-        $this->viewAssetPlaceholderFactory = $this->getMockBuilder(PlaceholderFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $objectManagerHelper->setBackwardCompatibleProperty(
-            $this->image,
-            'viewAssetPlaceholderFactory',
-            $this->viewAssetPlaceholderFactory
-        );
     }
 
     public function testSetGetQuality()