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

 - Code style fixes

Author: ishakhsuvarov

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

@@ -19,7 +19,6 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Json\EncoderInterface;
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
@@ -38,22 +37,22 @@ class Gallery extends AbstractView
     protected $jsonEncoder;
 
     /**
-     * @var DataObject
+     * @var array
      */
-    protected $galleryImagesConfig;
+    private $galleryImagesConfig;
 
     /**
      * @var ImagesConfigFactoryInterface
      */
     private $galleryImagesConfigFactory;
 
     /**
-     * @param Context                      $context
-     * @param ArrayUtils                   $arrayUtils
-     * @param EncoderInterface             $jsonEncoder
+     * @param Context $context
+     * @param ArrayUtils $arrayUtils
+     * @param EncoderInterface $jsonEncoder
+     * @param array $data
      * @param ImagesConfigFactoryInterface $imagesConfigFactory
-     * @param array                        $galleryImagesConfig
-     * @param array                        $data
+     * @param array $galleryImagesConfig
      */
     public function __construct(
         Context $context,
@@ -64,8 +63,9 @@ public function __construct(
         array $galleryImagesConfig = []
     ) {
         parent::__construct($context, $arrayUtils, $data);
-        $this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
-        $this->galleryImagesConfigFactory = $imagesConfigFactory ?: ObjectManager::getInstance()->get(ImagesConfigFactoryInterface::class);
+        $this->jsonEncoder = $jsonEncoder;
+        $this->galleryImagesConfigFactory = $imagesConfigFactory ?: ObjectManager::getInstance()
+            ->get(ImagesConfigFactoryInterface::class);
         $this->galleryImagesConfig = $galleryImagesConfig;
     }
 
@@ -211,7 +211,8 @@ private function getConfigView()
     private function getGalleryImagesConfig()
     {
         if (false === $this->hasData('gallery_images_config')) {
-            $this->setData('gallery_images_config', $this->galleryImagesConfigFactory->create($this->galleryImagesConfig));
+            $galleryImageConfig = $this->galleryImagesConfigFactory->create($this->galleryImagesConfig);
+            $this->setData('gallery_images_config', $galleryImageConfig);
         }
 
         return $this->getData('gallery_images_config');

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

@@ -1,24 +1,21 @@
 <?php
 /**
- *
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Model\Product\Gallery;
 
-use \Magento\Framework\Data\CollectionFactory;
+use Magento\Framework\Data\CollectionFactory;
 use Magento\Framework\DataObject;
 
 class ImagesConfigFactory implements ImagesConfigFactoryInterface
 {
     /**
-     * @var \Magento\Framework\Data\CollectionFactory
+     * @var CollectionFactory
      */
     protected $dataCollectionFactory;
 
     /**
-     * ImagesConfigFactory constructor.
-     *
      * @param CollectionFactory $dataCollectionFactory
      */
     public function __construct(CollectionFactory $dataCollectionFactory)
@@ -27,12 +24,7 @@ public function __construct(CollectionFactory $dataCollectionFactory)
     }
 
     /**
-     * create Gallery Images Config Collection from array
-     *
-     * @param array $imagesConfig
-     * @param array $data
-     *
-     * @return \Magento\Framework\Data\Collection
+     * @inheritdoc
      */
     public function create(array $imagesConfig, array $data = [])
     {

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

@@ -1,15 +1,14 @@
 <?php
 /**
- *
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Model\Product\Gallery;
 
 interface ImagesConfigFactoryInterface
 {
     /**
-     * create Gallery Images Config Collection from array
+     * Create Gallery Images Config Collection from array
      *
      * @param array $imagesConfig
      * @param array $data

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

@@ -22,13 +22,13 @@ class Gallery extends \Magento\Catalog\Block\Product\View\Gallery
     protected $mediaHelper;
 
     /**
-     * @param \Magento\Catalog\Block\Product\Context                              $context
-     * @param \Magento\Framework\Stdlib\ArrayUtils                                $arrayUtils
-     * @param \Magento\Framework\Json\EncoderInterface                            $jsonEncoder
-     * @param \Magento\ProductVideo\Helper\Media                                  $mediaHelper
+     * @param \Magento\Catalog\Block\Product\Context $context
+     * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param \Magento\ProductVideo\Helper\Media $mediaHelper
+     * @param array $data
      * @param \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface $imagesConfigFactory
-     * @param array                                                               $galleryImagesConfig
-     * @param array                                                               $data
+     * @param array $galleryImagesConfig
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -43,9 +43,9 @@ public function __construct(
             $context,
             $arrayUtils,
             $jsonEncoder,
+            $data,
             $imagesConfigFactory,
-            $galleryImagesConfig,
-            $data
+            $galleryImagesConfig
         );
         $this->mediaHelper = $mediaHelper;
     }