From 22d56dbde36f48aa9ee252f2297c31e5897b41fb Mon Sep 17 00:00:00 2001 From: Maciej Kobus Date: Wed, 22 Nov 2023 08:36:05 +0100 Subject: [PATCH] Fixed FileSizeValidator type that caused existing migrations to fail --- src/lib/FieldType/Image/Type.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/FieldType/Image/Type.php b/src/lib/FieldType/Image/Type.php index 56ae58f61f..3dfc44dadb 100644 --- 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' => 'float', + 'type' => 'numeric', 'default' => null, ], ], @@ -134,7 +134,7 @@ protected function checkValueStructure(BaseValue $value) ); } - if (isset($value->fileSize) && (!is_int($value->fileSize) || $value->fileSize < 0)) { + if (isset($value->fileSize) && (!is_float($value->fileSize) || $value->fileSize < 0)) { throw new InvalidArgumentType( '$value->fileSize', 'int', @@ -233,14 +233,14 @@ public function validateValidatorConfiguration($validatorConfiguration) ); break; } - if (!is_float($parameters['maxFileSize']) && $parameters['maxFileSize'] !== null) { + if (!is_numeric($parameters['maxFileSize']) && $parameters['maxFileSize'] !== null) { $validationErrors[] = new ValidationError( 'Validator %validator% expects parameter %parameter% to be of %type%.', null, [ '%validator%' => $validatorIdentifier, '%parameter%' => 'maxFileSize', - '%type%' => 'float', + '%type%' => 'numeric', ], "[$validatorIdentifier][maxFileSize]" );