MAGETWO-65480: [Backport] - [Performance] Image metadata caching - for 2.1.6

Author: zakdma

app/code/Magento/Catalog/Block/Product/ImageBlockBuilder.php

@@ -67,13 +67,17 @@ public function __construct(
      *
      * @param AssetImage $imageAsset
      * @return array
+     * @throws \Exception
      */
     private function getImageSize(AssetImage $imageAsset)
     {
         $imagePath = $imageAsset->getPath();
         $size = $this->sizeCache->load($imagePath);
         if (!$size) {
             $size = getimagesize($imagePath);
+            if (!$size) {
+                throw new \Exception('An error occurred while reading file: ' . $imagePath);
+            }
             $this->sizeCache->save($size[0], $size[1], $imagePath);
             $size = ['width' => $size[0], 'height' => $size[1]];
         }

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

@@ -26,8 +26,7 @@ class SizeCache
 
     public function __construct(
         CacheInterface $cacheManager
-    )
-    {
+    ) {
         $this->cacheManager = $cacheManager;
     }