Merge remote-tracking branch 'origin/MAGETWO-61797' into 2.1.8-develop-pr8

Author: zakdma

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

@@ -29,7 +29,10 @@ protected function processDeletedImages($product, array &$images)
             if (!empty($image['removed'])) {
                 if (!empty($image['value_id']) && !isset($picturesInOtherStores[$image['file']])) {
                     $recordsToDelete[] = $image['value_id'];
-                    $filesToDelete[] = ltrim($image['file'], '/');
+                    // only delete physical files if they are not used by any other products
+                    if (!($this->resourceModel->countImageUses($image['file']) > 1)) {
+                        $filesToDelete[] = ltrim($image['file'], '/');
+                    }
                 }
             }
         }

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

@@ -449,4 +449,22 @@ public function getProductImages($product, $storeIds)
 
         return $this->getConnection()->fetchAll($select);
     }
+
+    /**
+     * Counts uses of this image.
+     *
+     * @param string $image
+     * @return int
+     */
+    public function countImageUses($image)
+    {
+        $select = $this->getConnection()->select()
+            ->from(
+                [$this->getMainTableAlias() => $this->getMainTable()],
+                'count(*)'
+            )
+            ->where('value = ?', $image);
+
+        return $this->getConnection()->fetchOne($select);
+    }
 }

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/GalleryTest.php

@@ -53,7 +53,7 @@ protected function setUp()
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->connection = $this->getMock(
-            'Magento\Framework\DB\Adapter\Pdo\Mysql',
+            \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
             [],
             [],
             '',
@@ -63,7 +63,7 @@ protected function setUp()
             ->method('setCacheAdapter');
 
         $metadata = $this->getMock(
-            'Magento\Framework\EntityManager\EntityMetadata',
+            \Magento\Framework\EntityManager\EntityMetadata::class,
             [],
             [],
             '',
@@ -77,29 +77,35 @@ protected function setUp()
             ->willReturn($this->connection);
 
         $metadataPool = $this->getMock(
-            'Magento\Framework\EntityManager\MetadataPool',
+            \Magento\Framework\EntityManager\MetadataPool::class,
             [],
             [],
             '',
             false
         );
         $metadataPool->expects($this->once())
             ->method('getMetadata')
-            ->with('Magento\Catalog\Api\Data\ProductInterface')
+            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
             ->willReturn($metadata);
 
-        $resource = $this->getMock('Magento\Framework\App\ResourceConnection', [], [], '', false);
+        $resource = $this->getMock(\Magento\Framework\App\ResourceConnection::class, [], [], '', false);
         $resource->expects($this->any())->method('getTableName')->willReturn('table');
         $this->resource = $objectManager->getObject(
-            'Magento\Catalog\Model\ResourceModel\Product\Gallery',
+            \Magento\Catalog\Model\ResourceModel\Product\Gallery::class,
             [
                 'metadataPool' => $metadataPool,
                 'resource' => $resource
             ]
         );
-        $this->product = $this->getMock('Magento\Catalog\Model\Product', [], [], '', false);
-        $this->select = $this->getMock('Magento\Framework\DB\Select', [], [], '', false);
-        $this->attribute = $this->getMock('Magento\Eav\Model\Entity\Attribute\AbstractAttribute', [], [], '', false);
+        $this->product = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
+        $this->select = $this->getMock(\Magento\Framework\DB\Select::class, [], [], '', false);
+        $this->attribute = $this->getMock(
+            \Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class,
+            [],
+            [],
+            '',
+            false
+        );
     }
 
     public function testLoadDataFromTableByValueId()
@@ -437,4 +443,32 @@ public function testDeleteGalleryValueInStore()
 
         $this->resource->deleteGalleryValueInStore($valueId, $entityId, $storeId);
     }
+
+    public function testCountImageUses()
+    {
+        $results = [
+            [
+                'value_id' => '1',
+                'attribute_id' => 90,
+                'value' => '/d/o/download_7.jpg',
+                'media_type' => 'image',
+                'disabled' => '0',
+            ],
+        ];
+
+        $this->connection->expects($this->once())->method('select')->will($this->returnValue($this->select));
+        $this->select->expects($this->at(0))
+            ->method('from')
+            ->with(['main' => 'table'], 'count(*)')
+            ->willReturnSelf();
+        $this->select->expects($this->at(1))
+            ->method('where')
+            ->with('value = ?', 1)
+            ->willReturnSelf();
+        $this->connection->expects($this->once())
+            ->method('fetchOne')
+            ->with($this->select)
+            ->willReturn(count($results));
+        $this->assertEquals($this->resource->countImageUses(1), count($results));
+    }
 }