Merge pull request #1850 from magento-performance/MAGETWO-81090

[PERFORMANCE] PAT Build improvement

Author: vzabaznov

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

@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Block\Product;
 
 use Magento\Catalog\Helper\ImageFactory as HelperFactory;
+use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
 
 class ImageBuilder
 {
@@ -129,7 +130,11 @@ public function create()
             ? 'Magento_Catalog::product/image.phtml'
             : 'Magento_Catalog::product/image_with_borders.phtml';
 
-        $imagesize = $helper->getResizedImageInfo();
+        try {
+            $imagesize = $helper->getResizedImageInfo();
+        } catch (NotLoadInfoImageException $exception) {
+            $imagesize = [$helper->getWidth(), $helper->getHeight()];
+        }
 
         $data = [
             'data' => [
@@ -140,8 +145,8 @@ public function create()
                 'label' => $helper->getLabel(),
                 'ratio' =>  $this->getRatio($helper),
                 'custom_attributes' => $this->getCustomAttributes(),
-                'resized_image_width' => !empty($imagesize[0]) ? $imagesize[0] : $helper->getWidth(),
-                'resized_image_height' => !empty($imagesize[1]) ? $imagesize[1] : $helper->getHeight(),
+                'resized_image_width' => $imagesize[0],
+                'resized_image_height' => $imagesize[1],
             ],
         ];
 

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\Catalog\Model\Product;
 
+use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Image as MagentoImage;
@@ -877,17 +878,26 @@ protected function _fileExists($filename)
 
     /**
      * Return resized product image information
-     *
      * @return array
+     * @throws NotLoadInfoImageException
      */
     public function getResizedImageInfo()
     {
-        if ($this->isBaseFilePlaceholder() == true) {
-            $image = $this->imageAsset->getSourceFile();
-        } else {
-            $image = $this->imageAsset->getPath();
+        try {
+            if ($this->isBaseFilePlaceholder() == true) {
+                $image = $this->imageAsset->getSourceFile();
+            } else {
+                $image = $this->imageAsset->getPath();
+            }
+
+            $imageProperties = getimagesize($image);
+
+            return $imageProperties;
+        } finally {
+            if (empty($imageProperties)) {
+                throw new NotLoadInfoImageException(__('Can\'t get information about the picture: %1', $image));
+            }
         }
-        return getimagesize($image);
     }
 
     /**

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

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model\Product\Image;
+
+class NotLoadInfoImageException extends \Exception
+{
+}

app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php

@@ -11,6 +11,7 @@
 use Magento\Catalog\Api\Data\ProductRender\ImageInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
 use Magento\Catalog\Helper\ImageFactory;
+use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
 use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorInterface;
 use Magento\Framework\App\State;
 use Magento\Framework\View\DesignInterface;
@@ -102,7 +103,12 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
                     [$this, "emulateImageCreating"],
                     [$product, $imageCode, (int) $productRender->getStoreId(), $image]
                 );
-            $resizedInfo = $helper->getResizedImageInfo();
+
+            try {
+                $resizedInfo = $helper->getResizedImageInfo();
+            } catch (NotLoadInfoImageException $exception) {
+                $resizedInfo = [$helper->getWidth(), $helper->getHeight()];
+            }
 
             $image->setCode($imageCode);
             $image->setHeight($helper->getHeight());

app/code/Magento/Wishlist/CustomerData/Wishlist.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Wishlist\CustomerData;
 
+use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
 use Magento\Customer\CustomerData\SectionSourceInterface;
 
 /**
@@ -154,15 +155,19 @@ protected function getImageData($product)
             ? 'Magento_Catalog/product/image'
             : 'Magento_Catalog/product/image_with_borders';
 
-        $imagesize = $helper->getResizedImageInfo();
+        try {
+            $imagesize = $helper->getResizedImageInfo();
+        } catch (NotLoadInfoImageException $exception) {
+            $imagesize = [$helper->getWidth(), $helper->getHeight()];
+        }
 
         $width = $helper->getFrame()
             ? $helper->getWidth()
-            : (!empty($imagesize[0]) ? $imagesize[0] : $helper->getWidth());
+            : $imagesize[0];
 
         $height = $helper->getFrame()
             ? $helper->getHeight()
-            : (!empty($imagesize[1]) ? $imagesize[1] : $helper->getHeight());
+            : $imagesize[1];
 
         return [
             'template' => $template,

dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixtureModelTest.php

@@ -118,7 +118,7 @@ public function testFixtureGeneration()
 
         foreach ($this->entityAsserts as $entityAssert) {
             try {
-                $entityAssert->assert();
+                $this->assertTrue($entityAssert->assert());
             } catch (\AssertionError $assertionError) {
                 $this->assertTrue(false, $assertionError->getMessage());
             }

dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixturesAsserts/BundleProductsAssert.php

@@ -48,7 +48,7 @@ public function __construct(
     /**
      * Asserts that generated bundled products are valid
      *
-     * @return void
+     * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \AssertionError
      */
@@ -74,5 +74,7 @@ public function assert()
                 throw new \AssertionError('Bundle option product links amount is wrong');
             }
         }
+
+        return true;
     }
 }

dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixturesAsserts/ConfigurableProductsAssert.php

@@ -46,7 +46,7 @@ public function __construct(
     /**
      * Asserts that generated configurable products are valid
      *
-     * @return void
+     * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      * @throws \AssertionError
@@ -86,5 +86,7 @@ public function assert()
                 throw new \AssertionError('Configurable option values amount is wrong');
             }
         }
+
+        return true;
     }
 }

dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixturesAsserts/ImagesAssert.php

@@ -70,6 +70,7 @@ public function __construct(
     /**
      * Performs assertions over images
      *
+     * @return bool
      * @throws \AssertionError
      */
     public function assert()
@@ -82,6 +83,8 @@ public function assert()
             $this->assertProductMediaAttributes($product);
             $this->assertProductImageExistsInFS($product);
         }
+
+        return true;
     }
 
     /**

dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixturesAsserts/SimpleProductsAssert.php

@@ -43,7 +43,7 @@ public function __construct(
     /**
      * Asserts that generated simple products are valid
      *
-     * @return void
+     * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \AssertionError
      */
@@ -52,5 +52,7 @@ public function assert()
         $product = $this->productRepository->get(sprintf(SimpleProductsFixture::SKU_PATTERN, 1));
         $this->productAssert->assertProductsCount(SimpleProductsFixture::SKU_PATTERN, 2);
         $this->productAssert->assertProductType('simple', $product);
+
+        return true;
     }
 }