Changed maxFileSize value type to float

ibexa · Oct 31, 2023 · de43e90 · de43e90
1 parent 4ced86d
commit de43e90
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/lib/FieldType/Image/Type.php b/src/lib/FieldType/Image/Type.php
@@ -24,7 +24,7 @@ class Type extends FieldType implements TranslationContainerInterface
     protected $validatorConfigurationSchema = [
         'FileSizeValidator' => [
             'maxFileSize' => [
-                'type' => 'int',
+                'type' => 'float',
                 'default' => null,
             ],
         ],
@@ -233,14 +233,14 @@ public function validateValidatorConfiguration($validatorConfiguration)
                         );
                         break;
                     }
-                    if (!is_int($parameters['maxFileSize']) && $parameters['maxFileSize'] !== null) {
+                    if (!is_float($parameters['maxFileSize']) && $parameters['maxFileSize'] !== null) {
                         $validationErrors[] = new ValidationError(
                             'Validator %validator% expects parameter %parameter% to be of %type%.',
                             null,
                             [
                                 '%validator%' => $validatorIdentifier,
                                 '%parameter%' => 'maxFileSize',
-                                '%type%' => 'integer',
+                                '%type%' => 'float',
                             ],
                             "[$validatorIdentifier][maxFileSize]"
                         );

diff --git a/src/lib/Persistence/Legacy/Content/FieldValue/Converter/ImageConverter.php b/src/lib/Persistence/Legacy/Content/FieldValue/Converter/ImageConverter.php
@@ -183,7 +183,9 @@ public function toStorageFieldDefinition(FieldDefinition $fieldDef, StorageField
     {
         $validators = $fieldDef->fieldTypeConstraints->validators;
 
-        $storageDef->dataInt1 = $validators['FileSizeValidator']['maxFileSize'] ?? 0;
+        $storageDef->dataInt1 = isset($validators['FileSizeValidator']['maxFileSize'])
+            ? $validators['FileSizeValidator']['maxFileSize'] * 1024
+            : 0;
         $storageDef->dataInt2 = (int)($validators['AlternativeTextValidator']['required'] ?? 0);
     }
 
@@ -193,7 +195,7 @@ public function toFieldDefinition(StorageFieldDefinition $storageDef, FieldDefin
             [
                 'validators' => [
                     'FileSizeValidator' => [
-                        'maxFileSize' => $storageDef->dataInt1 !== 0 ? $storageDef->dataInt1 : null,
+                        'maxFileSize' => $storageDef->dataInt1 !== 0 ? $storageDef->dataInt1 / 1024 : null,
                     ],
                     'AlternativeTextValidator' => [
                         'required' => (bool)$storageDef->dataInt2,