Merge remote-tracking branch 'ezsystems/7.5' into 1.3

ezsystems · Jan 18, 2022 · fd94853 · fd94853
2 parents f95a4b7 + e212c8a
commit fd94853
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/eZ/Publish/API/Repository/Tests/FieldType/ImageIntegrationTest.php b/eZ/Publish/API/Repository/Tests/FieldType/ImageIntegrationTest.php
@@ -263,8 +263,10 @@ public function getValidUpdateFieldData()
      * Get externals updated field data values.
      *
      * This is a PHPUnit data provider
+     *
+     * @return array
      */
-    public function assertUpdatedFieldDataLoadedCorrect(Field $field): void
+    public function assertUpdatedFieldDataLoadedCorrect(Field $field)
     {
         self::assertInstanceOf(
             'eZ\\Publish\\Core\\FieldType\\Image\\Value',
@@ -616,8 +618,8 @@ protected function getValidSearchValueOne()
     {
         return new ImageValue(
             [
-                'fileName' => 'cafe-terrace-at-night.jpg',
-                'inputUri' => ($path = __DIR__ . '/_fixtures/image.jpg'),
+                'fileName' => '1234eeee1234-cafe-terrace-at-night.jpg',
+                'inputUri' => ($path = __DIR__ . '/_fixtures/1234eeee1234-image.jpg'),
                 'alternativeText' => 'café terrace at night, also known as the cafe terrace on the place du forum',
                 'fileSize' => filesize($path),
             ]
@@ -628,8 +630,8 @@ protected function getValidSearchValueTwo()
     {
         return new ImageValue(
             [
-                'fileName' => 'thatched-cottages-at-cordeville.png',
-                'inputUri' => ($path = __DIR__ . '/_fixtures/image.png'),
+                'fileName' => '2222eeee1111-thatched-cottages-at-cordeville.png',
+                'inputUri' => ($path = __DIR__ . '/_fixtures/2222eeee1111-image.png'),
                 'alternativeText' => 'chaumes de cordeville à auvers-sur-oise',
                 'fileSize' => filesize($path),
             ]

diff --git a/eZ/Publish/API/Repository/Tests/FieldType/_fixtures/1234eeee1234-image.jpg b/eZ/Publish/API/Repository/Tests/FieldType/_fixtures/1234eeee1234-image.jpg
diff --git a/eZ/Publish/API/Repository/Tests/FieldType/_fixtures/2222eeee1111-image.png b/eZ/Publish/API/Repository/Tests/FieldType/_fixtures/2222eeee1111-image.png