#3401: decouple product view gallery images config from Gallery Block

 - Code Style improvements

Author: ishakhsuvarov

app/code/Magento/Catalog/Block/Product/View/Gallery.php

@@ -78,18 +78,19 @@ public function getGalleryImages()
     {
         $product = $this->getProduct();
         $images = $product->getMediaGalleryImages();
-        if ($images instanceof \Magento\Framework\Data\Collection) {
-            foreach ($images as $image) {
-                foreach($this->getGalleryImagesConfig()->getItems() as $imageConfig) {
-                    /** @var Product $product */
-                    $image->setData(
-                        $imageConfig->getData('data_object_key'),
-                        $this->_imageHelper->init($product,
-                            $imageConfig['image_id'])
-                            ->setImageFile($image->getData('file'))
-                            ->getUrl()
-                    );
-                }
+        if (!$images instanceof \Magento\Framework\Data\Collection) {
+            return $images;
+        }
+
+        foreach ($images as $image) {
+            $galleryImagesConfig = $this->getGalleryImagesConfig()->getItems();
+            foreach ($galleryImagesConfig as $imageConfig) {
+                $image->setData(
+                    $imageConfig->getData('data_object_key'),
+                    $this->_imageHelper->init($product, $imageConfig['image_id'])
+                        ->setImageFile($image->getData('file'))
+                        ->getUrl()
+                );
             }
         }
 
@@ -131,7 +132,7 @@ public function getGalleryImagesJson()
                 'position' => $image->getData('position'),
                 'isMain'   => $this->isMainImage($image),
             ]);
-            foreach($this->getGalleryImagesConfig()->getItems() as $imageConfig) {
+            foreach ($this->getGalleryImagesConfig()->getItems() as $imageConfig) {
                 $imageItem->setData(
                     $imageConfig->getData('json_object_key'),
                     $image->getData($imageConfig->getData('data_object_key'))

app/code/Magento/Catalog/Model/Product/Gallery/ImagesConfigFactory.php

@@ -30,7 +30,7 @@ public function create(array $imagesConfig, array $data = [])
     {
         /** @var \Magento\Framework\Data\Collection $collection */
         $collection = $this->dataCollectionFactory->create($data);
-        array_map(function($imageConfig) use ($collection) {
+        array_map(function ($imageConfig) use ($collection) {
             $collection->addItem(new DataObject($imageConfig));
         }, $imagesConfig);
 

app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Test\Unit\Block\Product\View;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class GalleryTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -65,6 +68,7 @@ protected function setUp()
             $this->context,
             $this->arrayUtils,
             $this->jsonEncoderMock,
+            [],
             $this->imagesConfigFactoryMock
         );
     }
@@ -179,15 +183,16 @@ private function getImagesCollection()
      */
     private function getImagesConfigFactory()
     {
-        $this->galleryImagesConfigMock = $this->getMockBuilder('\Magento\Framework\Data\Collection')
+        $this->galleryImagesConfigMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->galleryImagesConfigMock->expects($this->any())
             ->method('getIterator')
             ->willReturn(new \ArrayIterator($this->getGalleryImagesConfigItems()));
 
-        $galleryImagesConfigFactoryMock = $this->getMockBuilder('Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface')
+        $galleryImagesConfigFactoryMock = $this
+            ->getMockBuilder(\Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface::class)
             ->disableOriginalConstructor()
             ->getMock();