MAGETWO-89051: Absorb image optimization from 2.1 into 2.3

Author: duhon

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

@@ -814,7 +814,7 @@ public function getResizedImageInfo()
                 $image = $this->imageAsset->getPath();
             }
 
-            $imageProperties = $this->getimagesize($image);
+            $imageProperties = $this->getImageSize($image);
 
             return $imageProperties;
         } finally {

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

@@ -137,7 +137,7 @@ private function getWatermark(string $type): array
                 ScopeInterface::SCOPE_STORE
             );
             $width = !empty($size['width']) ? $size['width'] : null;
-            $height = !empty($size['width']) ? $size['height'] : null;
+            $height = !empty($size['height']) ? $size['height'] : null;
 
             return [
                 'watermark_file' => $file,

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

@@ -171,7 +171,7 @@ public function getModule()
     private function getMiscPath()
     {
         return $this->encryptor->hash(
-            implode('_', $this->convertTotoReadableFormat($this->miscParams)),
+            implode('_', $this->convertToReadableFormat($this->miscParams)),
             Encryptor::HASH_VERSION_MD5
         );
     }
@@ -194,7 +194,7 @@ private function getImageInfo()
      * @param $miscParams
      * @return array
      */
-    private function convertTotoReadableFormat($miscParams)
+    private function convertToReadableFormat($miscParams)
     {
         $miscParams['image_height'] = 'h:' . ($miscParams['image_height'] ?? 'empty');
         $miscParams['image_width'] = 'w:' . ($miscParams['image_width'] ?? 'empty');

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

@@ -82,6 +82,7 @@ class Media implements AppInterface
      * @var State
      */
     private $appState;
+
     /**
      * @var ImageResize
      */

app/code/Magento/MediaStorage/Service/ImageResize.php

@@ -148,13 +148,12 @@ public function resizeFromImageName(string $originalImageName)
      */
     public function resizeFromThemes(array $themes = null): \Generator
     {
-        $productImages = $this->productImage->getAllProductImages();
-
         $count = $this->productImage->getCountAllProductImages();
         if (!$count) {
             throw new NotFoundException(__('Cannot resize images - product images not found'));
         }
 
+        $productImages = $this->productImage->getAllProductImages();
         $viewImages = $this->getViewImages($themes ?? $this->getThemesInUse());
 
         foreach ($productImages as $image) {