MAGETWO-57175: Cannot delete product image

Author: xmav

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

@@ -78,7 +78,7 @@ public function addMediaDataToProduct(Product $product, array $mediaEntries)
 
         foreach ($mediaEntries as $mediaEntry) {
             $mediaEntry = $this->substituteNullsWithDefaultValues($mediaEntry);
-            $value['images'][] = $mediaEntry;
+            $value['images'][$mediaEntry['value_id']] = $mediaEntry;
         }
         $product->setData($attrCode, $value);
     }

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/ReadHandlerTest.php

@@ -61,11 +61,18 @@ public function testExecute()
 
         $this->assertArrayHasKey('media_gallery', $data);
         $this->assertArrayHasKey('images', $data['media_gallery']);
-        $image = array_shift($data['media_gallery']['images']);
 
-        $this->assertEquals(
-            'Image Alt Text',
-            $image['label']
-        );
+        $this->assertCount(1, $data['media_gallery']['images']);
+        foreach ($data['media_gallery']['images'] as $valueId => $imageData) {
+            $this->assertEquals(
+                'Image Alt Text',
+                $imageData['label']
+            );
+            $this->assertEquals(
+                $imageData['value_id'],
+                $valueId,
+                "Required by Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml"
+            );
+        }
     }
 }