EZP-31681: Fixed Image Value comparison via FT Comparable contract

eZ/Publish/Core/FieldType/Image/Value.php

@@ -9,6 +9,8 @@
 use eZ\Publish\Core\FieldType\Value as BaseValue;
 use eZ\Publish\Core\Base\Exceptions\InvalidArgumentType;
 use eZ\Publish\API\Repository\Exceptions\PropertyNotFoundException;
+use eZ\Publish\SPI\FieldType\Comparable;
+use eZ\Publish\SPI\FieldType\Value as SPIValue;
 
 /**
  * Value for Image field type.
@@ -19,7 +21,7 @@
  * @todo Mime type?
  * @todo Dimensions?
  */
-class Value extends BaseValue
+class Value extends BaseValue implements Comparable
 {
     /**
      * Image id.
@@ -177,4 +179,27 @@ public function __set($propertyName, $propertyValue)
 
         throw new PropertyNotFoundException($propertyName, get_class($this));
     }
+
+    public function isEquals(SPIValue $value): bool
+    {
+        return $this->toHash($value) === $this->toHash($this);
+    }
+
+    /**
+     * @return array
+     */
+    public function toHash(SPIValue $value)
+    {
+        return [
+            'id' => $value->id,
+            'path' => $value->inputUri ?: $value->id,
+            'alternativeText' => $value->alternativeText,
+            'fileName' => $value->fileName,
+            'fileSize' => $value->fileSize,
+            'uri' => $value->uri,
+            'inputUri' => $value->inputUri,
+            'width' => $value->width,
+            'height' => $value->height,
+        ];
+    }
 }

eZ/Publish/Core/FieldType/Tests/Image/ValueTest.php

@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace eZ\Publish\Core\FieldType\Tests\Image;
+
+use eZ\Publish\Core\FieldType\Image\Value as ImageValue;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @group fieldType
+ * @group ezfloat
+ */
+class ValueTest extends TestCase
+{
+    public function getImageInputPath()
+    {
+        return __DIR__ . '/squirrel-developers.jpg';
+    }
+
+    /**
+     * @dataProvider provideInputForIsEqual
+     */
+    public function testIsEquals(ImageValue $imageValue, ImageValue $correctValue, ImageValue $incorrectValue)
+    {
+        $this->assertTrue($imageValue->isEquals($correctValue));
+
+        $this->assertFalse($imageValue->isEquals($incorrectValue));
+    }
+
+    public function provideInputForIsEqual()
+    {
+        return [
+            [
+                new ImageValue([
+                    'id' => $this->getImageInputPath(),
+                    'fileName' => 'Sindelfingen-Squirrels.jpg',
+                    'fileSize' => 23,
+                    'alternativeText' => 'This is so Sindelfingen!',
+                    'imageId' => '123-12345',
+                    'uri' => 'http://' . $this->getImageInputPath(),
+                    'width' => 123,
+                    'height' => 456,
+                ]),
+                new ImageValue([
+                    'id' => $this->getImageInputPath(),
+                    'path' => $this->getImageInputPath(),
+                    'fileName' => 'Sindelfingen-Squirrels.jpg',
+                    'fileSize' => 23,
+                    'alternativeText' => 'This is so Sindelfingen!',
+                    'imageId' => '123-12346',
+                    'uri' => 'http://' . $this->getImageInputPath(),
+                    'inputUri' => null,
+                    'width' => 123,
+                    'height' => 456,
+                ]),
+                new ImageValue([
+                    'id' => $this->getImageInputPath(),
+                    'path' => $this->getImageInputPath(),
+                    'fileName' => 'Sindelfingen-Squirrels.jpg',
+                    'fileSize' => 23,
+                    'alternativeText' => 'This is so Sindelfingen!',
+                    'imageId' => '123-12345',
+                    'uri' => 'http://' . $this->getImageInputPath(),
+                    'inputUri' => null,
+                    'width' => 124,
+                    'height' => 456,
+                ]),
+            ],
+        ];
+    }
+}

eZ/Publish/Core/Repository/ContentService.php

@@ -18,6 +18,8 @@
 use eZ\Publish\Core\Repository\Values\Content\Content;
 use eZ\Publish\Core\Repository\Values\Content\Location;
 use eZ\Publish\API\Repository\Values\Content\Language;
+use eZ\Publish\SPI\FieldType\FieldType;
+use eZ\Publish\SPI\FieldType\Value;
 use eZ\Publish\SPI\Persistence\Handler;
 use eZ\Publish\API\Repository\Values\Content\ContentUpdateStruct as APIContentUpdateStruct;
 use eZ\Publish\API\Repository\Values\ContentType\ContentType;
@@ -1722,7 +1724,7 @@ protected function copyTranslationsFromPublishedVersion(APIVersionInfo $versionI
 
             if ($newValue !== null
                 && $field->value !== null
-                && $fieldType->toHash($newValue) === $fieldType->toHash($field->value)) {
+                && $this->isHashEqual($fieldType, $newValue, $field->value)) {
                 continue;
             }
 
@@ -1742,6 +1744,19 @@ protected function copyTranslationsFromPublishedVersion(APIVersionInfo $versionI
         $this->internalUpdateContent($versionInfo, $updateStruct);
     }
 
+    protected function isHashEqual(FieldType $fieldType, Value $newValue, Value $fieldValue): bool
+    {
+        $newHash = $fieldType->toHash($newValue);
+        $currentHash = $fieldType->toHash($fieldValue);
+        if ($newValue instanceof \eZ\Publish\SPI\FieldType\Comparable) {
+            return $newValue->isEquals($newHash, $currentHash);
+        } elseif ($newHash === $currentHash) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Publishes a content version.
      *

eZ/Publish/SPI/FieldType/Comparable.php

@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace eZ\Publish\SPI\FieldType;
+
+interface Comparable
+{
+    public function isEquals(Value $value): bool;
+
+    public function toHash(Value $value);
+}