implement code review change requests

Author: David Verholen

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

@@ -11,20 +11,26 @@
  */
 namespace Magento\Catalog\Block\Product\View;
 
+use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface;
 use Magento\Framework\Data\Collection;
 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;
 
-class Gallery extends \Magento\Catalog\Block\Product\View\AbstractView
+class Gallery extends AbstractView
 {
     /**
      * @var \Magento\Framework\Config\View
      */
     protected $configView;
 
     /**
-     * @var \Magento\Framework\Json\EncoderInterface
+     * @var EncoderInterface
      */
     protected $jsonEncoder;
 
@@ -34,24 +40,30 @@ class Gallery extends \Magento\Catalog\Block\Product\View\AbstractView
     protected $galleryImagesConfig;
 
     /**
-     * @param \Magento\Catalog\Block\Product\Context                              $context
-     * @param \Magento\Framework\Stdlib\ArrayUtils                                $arrayUtils
-     * @param \Magento\Framework\Json\EncoderInterface                            $jsonEncoder
-     * @param \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface $imagesConfigFactory
-     * @param array                                                               $galleryImagesConfig
-     * @param array                                                               $data
+     * @var ImagesConfigFactoryInterface
+     */
+    private $galleryImagesConfigFactory;
+
+    /**
+     * @param Context                      $context
+     * @param ArrayUtils                   $arrayUtils
+     * @param EncoderInterface             $jsonEncoder
+     * @param ImagesConfigFactoryInterface $imagesConfigFactory
+     * @param array                        $galleryImagesConfig
+     * @param array                        $data
      */
     public function __construct(
-        \Magento\Catalog\Block\Product\Context $context,
-        \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
-        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
-        \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface $imagesConfigFactory,
-        array $galleryImagesConfig = [],
-        array $data = []
+        Context $context,
+        ArrayUtils $arrayUtils,
+        EncoderInterface $jsonEncoder,
+        array $data = [],
+        ImagesConfigFactoryInterface $imagesConfigFactory = null,
+        array $galleryImagesConfig = []
     ) {
-        $this->jsonEncoder = $jsonEncoder;
         parent::__construct($context, $arrayUtils, $data);
-        $this->galleryImagesConfig = $imagesConfigFactory->create($galleryImagesConfig);
+        $this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
+        $this->galleryImagesConfigFactory = $imagesConfigFactory ?: ObjectManager::getInstance()->get(ImagesConfigFactoryInterface::class);
+        $this->galleryImagesConfig = $galleryImagesConfig;
     }
 
     /**
@@ -65,7 +77,7 @@ public function getGalleryImages()
         $images = $product->getMediaGalleryImages();
         if ($images instanceof \Magento\Framework\Data\Collection) {
             foreach ($images as $image) {
-                foreach($this->galleryImagesConfig->getItems() as $imageConfig) {
+                foreach($this->getGalleryImagesConfig()->getItems() as $imageConfig) {
                     /** @var Product $product */
                     $image->setData(
                         $imageConfig->getData('data_object_key'),
@@ -116,7 +128,7 @@ public function getGalleryImagesJson()
                 'position' => $image->getData('position'),
                 'isMain'   => $this->isMainImage($image),
             ]);
-            foreach($this->galleryImagesConfig->getItems() as $imageConfig) {
+            foreach($this->getGalleryImagesConfig()->getItems() as $imageConfig) {
                 $imageItem->setData(
                     $imageConfig->getData('json_object_key'),
                     $image->getData($imageConfig->getData('data_object_key'))
@@ -189,4 +201,16 @@ private function getConfigView()
         }
         return $this->configView;
     }
+
+    /**
+     * @return Collection
+     */
+    private function getGalleryImagesConfig()
+    {
+        if (false === $this->hasData('gallery_images_config')) {
+            $this->setData('gallery_images_config', $this->galleryImagesConfigFactory->create($this->galleryImagesConfig));
+        }
+
+        return $this->getData('gallery_images_config');
+    }
 }

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

@@ -14,16 +14,16 @@ class ImagesConfigFactory implements ImagesConfigFactoryInterface
     /**
      * @var \Magento\Framework\Data\CollectionFactory
      */
-    protected $_dataCollectionFactory;
+    protected $dataCollectionFactory;
 
     /**
      * ImagesConfigFactory constructor.
      *
-     * @param CollectionFactory $_dataCollectionFactory
+     * @param CollectionFactory $dataCollectionFactory
      */
-    public function __construct(CollectionFactory $_dataCollectionFactory)
+    public function __construct(CollectionFactory $dataCollectionFactory)
     {
-        $this->_dataCollectionFactory = $_dataCollectionFactory;
+        $this->dataCollectionFactory = $dataCollectionFactory;
     }
 
     /**
@@ -37,7 +37,7 @@ public function __construct(CollectionFactory $_dataCollectionFactory)
     public function create(array $imagesConfig, array $data = [])
     {
         /** @var \Magento\Framework\Data\Collection $collection */
-        $collection = $this->_dataCollectionFactory->create($data);
+        $collection = $this->dataCollectionFactory->create($data);
         array_map(function($imageConfig) use ($collection) {
             $collection->addItem(new DataObject($imageConfig));
         }, $imagesConfig);

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

@@ -32,9 +32,9 @@ public function __construct(
         \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\ProductVideo\Helper\Media $mediaHelper,
-        \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface $imagesConfigFactory,
-        array $galleryImagesConfig = [],
-        array $data = []
+        array $data = [],
+        \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface $imagesConfigFactory = null,
+        array $galleryImagesConfig = []
     ) {
         parent::__construct(
             $context,