Merge branch 'maindevelop' into bugfix

Author: irenelagno

app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php

@@ -122,21 +122,40 @@ public function getAddImagesButton()
      */
     public function getImagesJson()
     {
-        if (is_array($this->getElement()->getImages())) {
-            $value = $this->getElement()->getImages();
+        $value = $this->getElement()->getImages();
+        if (is_array($value) &&
+            array_key_exists('images', $value) &&
+            is_array($value['images']) &&
+            count($value['images'])
+        ) {
             $directory = $this->_filesystem->getDirectoryRead(DirectoryList::MEDIA);
-            if (is_array($value['images']) && count($value['images']) > 0) {
-                foreach ($value['images'] as &$image) {
-                    $image['url'] = $this->_mediaConfig->getMediaUrl($image['file']);
-                    $fileHandler = $directory->stat($this->_mediaConfig->getMediaPath($image['file']));
-                    $image['size'] = $fileHandler['size'];
-                }
-                return $this->_jsonEncoder->encode($value['images']);
+            $images = $this->sortImagesByPosition($value['images']);
+            foreach ($images as &$image) {
+                $image['url'] = $this->_mediaConfig->getMediaUrl($image['file']);
+                $fileHandler = $directory->stat($this->_mediaConfig->getMediaPath($image['file']));
+                $image['size'] = $fileHandler['size'];
             }
+            return $this->_jsonEncoder->encode($images);
         }
         return '[]';
     }
 
+    /**
+     * Sort images array by position key
+     *
+     * @param array $images
+     * @return array
+     */
+    private function sortImagesByPosition($images)
+    {
+        if (is_array($images)) {
+            usort($images, function ($imageA, $imageB) {
+                return ($imageA['position'] < $imageB['position']) ? -1 : 1;
+            });
+        }
+        return $images;
+    }
+
     /**
      * @return string
      */

app/code/Magento/Catalog/Model/ResourceModel/Category/Collection/Factory.php

@@ -5,6 +5,10 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Category\Collection;
 
+/**
+ * Class Factory
+ * @deprecated
+ */
 class Factory
 {
     /**

app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php

@@ -6,6 +6,8 @@
 namespace Magento\Catalog\Model\ResourceModel\Category;
 
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\Catalog\Model\ResourceModel\Category\Flat\CollectionFactory as CategoryFlatCollectionFactory;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Category flat model
@@ -68,6 +70,7 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Category collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
+     * @deprecated
      */
     protected $_categoryCollectionFactory;
 
@@ -78,6 +81,11 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      */
     protected $_categoryFactory;
 
+    /**
+     * @var CategoryFlatCollectionFactory
+     */
+    private $categoryFlatCollectionFactory;
+
     /**
      * Class constructor
      *
@@ -399,7 +407,7 @@ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $as
             );
             $parentPath = $this->getConnection()->fetchOne($select);
 
-            $collection = $this->_categoryCollectionFactory
+            $collection = $this->getCategoryFlatCollectionFactory()
                 ->create()
                 ->addNameToResult()
                 ->addUrlRewriteToResult()
@@ -690,4 +698,19 @@ public function getProductsPosition($category)
 
         return $this->getConnection()->fetchPairs($select, $bind);
     }
+
+    /**
+     * Get instance of CategoryFlatCollectionFactory
+     *
+     * @return CategoryFlatCollectionFactory
+     */
+    private function getCategoryFlatCollectionFactory()
+    {
+        if (!$this->categoryFlatCollectionFactory instanceof CategoryFlatCollectionFactory) {
+            $this->categoryFlatCollectionFactory = ObjectManager::getInstance()
+                ->get(CategoryFlatCollectionFactory::class);
+        }
+
+        return $this->categoryFlatCollectionFactory;
+    }
 }

app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php

@@ -82,37 +82,59 @@ public function testGetImagesJson()
             ['file_1.jpg', 'catalog/product/image_1.jpg'],
             ['file_2.jpg', 'catalog/product/image_2.jpg']
         ];
-        // @codingStandardsIgnoreStart
-        $encodedString = '[{"value_id":"1","file":"image_1.jpg","media_type":"image","url":"http:\/\/magento2.dev\/pub\/media\/catalog\/product\/image_1.jpg","size":879394},{"value_id":"2","file":"image_2.jpg","media_type":"image","url":"http:\/\/magento2.dev\/pub\/media\/catalog\/product\/image`_2.jpg","size":399659}]';
-        // @codingStandardsIgnoreEnd
+
+        $sizeMap = [
+            ['catalog/product/image_1.jpg', ['size' => 399659]],
+            ['catalog/product/image_2.jpg', ['size' => 879394]]
+        ];
+
+        $imagesResult = [
+            [
+                'value_id' => '2',
+                'file' => 'file_2.jpg',
+                'media_type' => 'image',
+                'position' => '0',
+                'url' => 'url_to_the_image/image_2.jpg',
+                'size' => 879394
+            ],
+            [
+                'value_id' => '1',
+                'file' => 'file_1.jpg',
+                'media_type' => 'image',
+                'position' => '1',
+                'url' => 'url_to_the_image/image_1.jpg',
+                'size' => 399659
+            ]
+        ];
+
         $images = [
             'images' => [
                 [
                     'value_id' => '1',
                     'file' => 'file_1.jpg',
                     'media_type' => 'image',
+                    'position' => '1'
                 ] ,
                 [
                     'value_id' => '2',
                     'file' => 'file_2.jpg',
                     'media_type' => 'image',
+                    'position' => '0'
                 ]
             ]
         ];
-        $firstStat = ['size' => 879394];
-        $secondStat = ['size' => 399659];
+
         $this->content->setElement($this->galleryMock);
-        $this->galleryMock->expects($this->any())->method('getImages')->willReturn($images);
+        $this->galleryMock->expects($this->once())->method('getImages')->willReturn($images);
         $this->fileSystemMock->expects($this->once())->method('getDirectoryRead')->willReturn($this->readMock);
 
         $this->mediaConfigMock->expects($this->any())->method('getMediaUrl')->willReturnMap($url);
-        $this->mediaConfigMock->expects($this->any())->method('getMediaPath')->willReturn($mediaPath);
+        $this->mediaConfigMock->expects($this->any())->method('getMediaPath')->willReturnMap($mediaPath);
 
-        $this->readMock->expects($this->at(0))->method('stat')->willReturn($firstStat);
-        $this->readMock->expects($this->at(1))->method('stat')->willReturn($secondStat);
-        $this->jsonEncoderMock->expects($this->once())->method('encode')->willReturn($encodedString);
+        $this->readMock->expects($this->any())->method('stat')->willReturnMap($sizeMap);
+        $this->jsonEncoderMock->expects($this->once())->method('encode')->willReturnCallback('json_encode');
 
-        $this->assertSame($encodedString, $this->content->getImagesJson());
+        $this->assertSame(json_encode($imagesResult), $this->content->getImagesJson());
     }
 
     public function testGetImagesJsonWithoutImages()