Fixes after review

ibexa · Dec 5, 2023 · 29a2224 · 29a2224
1 parent 2e03387
commit 29a2224
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -30625,11 +30625,6 @@ parameters:
 			count: 1
 			path: tests/integration/Core/Repository/FieldType/ImageIntegrationTest.php
 
-		-
-			message: "#^Method Ibexa\\\\Tests\\\\Integration\\\\Core\\\\Repository\\\\FieldType\\\\ImageIntegrationTest\\:\\:getSettingsSchema\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/integration/Core/Repository/FieldType/ImageIntegrationTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\Integration\\\\Core\\\\Repository\\\\FieldType\\\\ImageIntegrationTest\\:\\:getStoragePrefix\\(\\) has no return type specified\\.$#"
 			count: 1

diff --git a/src/lib/FieldType/Image/Type.php b/src/lib/FieldType/Image/Type.php
@@ -36,7 +36,8 @@ class Type extends FieldType implements TranslationContainerInterface
         ],
     ];
 
-    /** @var array{
+    /**
+     * @var array{
      *     mimeTypes: array{
      *         type: string,
      *         default: array{},

diff --git a/src/lib/FieldType/Validator/ImageValidator.php b/src/lib/FieldType/Validator/ImageValidator.php
@@ -51,7 +51,8 @@ private function innerValidate($filePath, array $mimeTypes): bool
     {
         // silence `getimagesize` error as extension-wise valid image files might produce it anyway
         // note that file extension checking is done using other validation which should be called before this one
-        if (!$imageData = @getimagesize($filePath)) {
+        $imageData = @getimagesize($filePath);
+        if (false === $imageData) {
             $this->errors[] = new ValidationError(
                 'A valid image file is required.',
                 null,

diff --git a/src/lib/Persistence/Legacy/Content/FieldValue/Converter/ImageConverter.php b/src/lib/Persistence/Legacy/Content/FieldValue/Converter/ImageConverter.php
@@ -210,7 +210,7 @@ public function toFieldDefinition(StorageFieldDefinition $storageDef, FieldDefin
     }
 
     /**
-     * @return array<string>
+     * @return array<string, string>
      *
      * @throws \JsonException
      */

diff --git a/tests/integration/Core/Repository/FieldType/ImageIntegrationTest.php b/tests/integration/Core/Repository/FieldType/ImageIntegrationTest.php
@@ -71,11 +71,14 @@ public function getTypeName()
     }
 
     /**
-     * Get expected settings schema.
-     *
-     * @return array
+     * @return array{
+     *      mimeTypes: array{
+     *          type: string,
+     *          default: array{},
+     *      }
+     *  }
      */
-    public function getSettingsSchema()
+    public function getSettingsSchema(): array
     {
         return [
             'mimeTypes' => [
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         * @return array<string>
+         * @return array<string, string>
          *
          * @throws \JsonException
          */
@@ Expand Down @@