MAGETWO-89051: Absorb image optimization from 2.1 into 2.3

Author: duhon

app/code/Magento/Catalog/Model/View/Asset/Image.php

@@ -184,7 +184,6 @@ private function getMiscPath()
     private function getImageInfo()
     {
         $path = $this->getModule()
-            . DIRECTORY_SEPARATOR . $this->getSourceContentType()
             . DIRECTORY_SEPARATOR . $this->getMiscPath()
             . DIRECTORY_SEPARATOR . $this->getFilePath();
         return preg_replace('|\Q'. DIRECTORY_SEPARATOR . '\E+|', DIRECTORY_SEPARATOR, $path);

app/code/Magento/Catalog/Test/Unit/Model/View/Asset/ImageTest.php

@@ -118,14 +118,13 @@ public function testGetPath($filePath, $miscParams)
                 'miscParams' => $miscParams
             ]
         );
-        $imageType = $miscParams['image_type'] ?? 'image';
         $miscParams['background'] = isset($miscParams['background']) ? implode(',', $miscParams['background']) : '';
         $absolutePath = '/var/www/html/magento2ce/pub/media/catalog/product';
         $hashPath = md5(implode('_', $miscParams));
         $this->context->method('getPath')->willReturn($absolutePath);
         $this->encryptor->method('hash')->willReturn($hashPath);
         static::assertEquals(
-            $absolutePath . '/cache/' . $imageType . '/' . $hashPath . $filePath,
+            $absolutePath . '/cache/'. $hashPath . $filePath,
             $imageModel->getPath()
         );
     }
@@ -148,14 +147,13 @@ public function testGetUrl($filePath, $miscParams)
                 'miscParams' => $miscParams
             ]
         );
-        $imageType = $miscParams['image_type'] ?? 'image';
         $miscParams['background'] = isset($miscParams['background']) ? implode(',', $miscParams['background']) : '';
         $absolutePath = 'http://localhost/pub/media/catalog/product';
         $hashPath = md5(implode('_', $miscParams));
         $this->context->expects(static::once())->method('getBaseUrl')->willReturn($absolutePath);
         $this->encryptor->expects(static::once())->method('hash')->willReturn($hashPath);
         static::assertEquals(
-            $absolutePath . '/cache/' . $imageType . '/' . $hashPath . $filePath,
+            $absolutePath . '/cache/' . $hashPath . $filePath,
             $imageModel->getUrl()
         );
     }

app/code/Magento/MediaStorage/App/Media.php

@@ -172,14 +172,7 @@ public function launch()
 
     private function setPlaceholderImage()
     {
-        $exsistType = preg_match(
-            '/thumbnail|small_image|swatch_image|swatch_thumb|image/',
-            $this->relativeFileName,
-            $matches
-        );
-        $imageType = $exsistType ? $matches[0] : 'image';
-
-        $placeholder = $this->placeholderFactory->create(['type' => $imageType]);
+        $placeholder = $this->placeholderFactory->create(['type' => 'image']);
         $this->response->setFilePath($placeholder->getPath());
     }
 

dev/tests/integration/testsuite/Magento/Sitemap/Model/ResourceModel/Catalog/ProductTest.php

@@ -17,7 +17,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     /**
      * Base product image path
      */
-    const BASE_IMAGE_PATH = 'http://localhost/pub/media/catalog/product/cache/image/d2488fc0bc3ac9b3c170adf0d609e779';
+    const BASE_IMAGE_PATH = 'http://localhost/pub/media/catalog/product/cache/8d4d2075b1a30681853bef5bdc41b164';
 
     /**
      * Test getCollection None images