Merge remote-tracking branch 'origin/MAGETWO-61798' into 2.0.15-develop-pr8

Author: zakdma

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php

@@ -194,7 +194,10 @@ public function afterSave($object)
             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'], '/');
+                    }
                 }
                 continue;
             }

app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Media.php

@@ -398,4 +398,28 @@ public function loadMediaGalleryEntities($attributeId, $productId)
 
         return $this->getConnection()->fetchAll($select);
     }
+
+    /**
+     * Counts uses of the image.
+     *
+     * @param string $image
+     * @return int
+     * @deprecated 2.1.5
+     * Added to find out if product image is used for several different products.
+     * This method is absent in version >=2.1.0 & < 2.1.5.
+     * In 2.1.5 version it was added in Magento\Catalog\Model\ResourceModel\Product\Gallery.
+     */
+    public function countImageUses($image)
+    {
+        $select = $this->getConnection()->select()
+            ->from(
+                [$this->getMainTableAlias() => $this->getMainTable()],
+                'count(*)'
+            )
+            ->where('value = ?', $image);
+
+        $countImages = $this->getConnection()->fetchOne($select);
+
+        return $countImages;
+    }
 }

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Attribute/Backend/MediaTest.php

@@ -61,21 +61,21 @@ class MediaTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->connection = $this->getMock('Magento\Framework\DB\Adapter\Pdo\Mysql', [], [], '', false);
-        $resource = $this->getMock('Magento\Framework\App\ResourceConnection', [], [], '', false);
+        $this->connection = $this->getMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class, [], [], '', false);
+        $resource = $this->getMock(\Magento\Framework\App\ResourceConnection::class, [], [], '', false);
         $resource->expects($this->any())
                  ->method('getConnection')
                  ->willReturn($this->connection);
         $resource->expects($this->any())->method('getTableName')->willReturn('table');
         $this->connection->expects($this->any())->method('setCacheAdapter');
         $this->resource = $objectManager->getObject(
-            'Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Media',
+            \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Media::class,
             ['resource' => $resource]
         );
-        $this->product = $this->getMock('Magento\Catalog\Model\Product', [], [], '', false);
-        $this->model = $this->getMock('Magento\Catalog\Model\Product\Attribute\Backend\Media', [], [], '', 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->model = $this->getMock(\Magento\Catalog\Model\Product\Attribute\Backend\Media::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()
@@ -412,4 +412,33 @@ 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));
+    }
 }