[Validator] Update Type constraint, add number, finite-float an…

…d `finite-number` validations
symfony · Jul 13, 2023 · 9e112da · 9e112da
1 parent 80f1096
commit 9e112da
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 30 deletions.
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Allow single integer for the `versions` option of the `Uuid` constraint
  * Allow single constraint to be passed to the `constraints` option of the `When` constraint
+ * Add `Finite` constraint
 
 6.3
 ---

diff --git a/src/Symfony/Component/Validator/Constraints/TypeValidator.php b/src/Symfony/Component/Validator/Constraints/TypeValidator.php
@@ -21,35 +21,38 @@
 class TypeValidator extends ConstraintValidator
 {
     private const VALIDATION_FUNCTIONS = [
-        'bool' => 'is_bool',
-        'boolean' => 'is_bool',
-        'int' => 'is_int',
-        'integer' => 'is_int',
-        'long' => 'is_int',
-        'float' => 'is_float',
-        'double' => 'is_float',
-        'real' => 'is_float',
-        'numeric' => 'is_numeric',
-        'string' => 'is_string',
-        'scalar' => 'is_scalar',
-        'array' => 'is_array',
-        'iterable' => 'is_iterable',
-        'countable' => 'is_countable',
-        'callable' => 'is_callable',
-        'object' => 'is_object',
-        'resource' => 'is_resource',
-        'null' => 'is_null',
-        'alnum' => 'ctype_alnum',
-        'alpha' => 'ctype_alpha',
-        'cntrl' => 'ctype_cntrl',
-        'digit' => 'ctype_digit',
-        'graph' => 'ctype_graph',
-        'lower' => 'ctype_lower',
-        'print' => 'ctype_print',
-        'punct' => 'ctype_punct',
-        'space' => 'ctype_space',
-        'upper' => 'ctype_upper',
-        'xdigit' => 'ctype_xdigit',
+      'bool' => 'is_bool',
+      'boolean' => 'is_bool',
+      'int' => 'is_int',
+      'integer' => 'is_int',
+      'long' => 'is_int',
+      'float' => 'is_float',
+      'double' => 'is_float',
+      'real' => 'is_float',
+      'number' => 'is_int || is_float',
+      'finite-float' => 'is_float && is_finite',
+      'finite-number' => 'is_int || is_float && is_finite',
+      'numeric' => 'is_numeric',
+      'string' => 'is_string',
+      'scalar' => 'is_scalar',
+      'array' => 'is_array',
+      'iterable' => 'is_iterable',
+      'countable' => 'is_countable',
+      'callable' => 'is_callable',
+      'object' => 'is_object',
+      'resource' => 'is_resource',
+      'null' => 'is_null',
+      'alnum' => 'ctype_alnum',
+      'alpha' => 'ctype_alpha',
+      'cntrl' => 'ctype_cntrl',
+      'digit' => 'ctype_digit',
+      'graph' => 'ctype_graph',
+      'lower' => 'ctype_lower',
+      'print' => 'ctype_print',
+      'punct' => 'ctype_punct',
+      'space' => 'ctype_space',
+      'upper' => 'ctype_upper',
+      'xdigit' => 'ctype_xdigit',
     ];
 
     /**
@@ -69,7 +72,12 @@ public function validate(mixed $value, Constraint $constraint)
 
         foreach ($types as $type) {
             $type = strtolower($type);
-            if (isset(self::VALIDATION_FUNCTIONS[$type]) && self::VALIDATION_FUNCTIONS[$type]($value)) {
+            if (isset(self::VALIDATION_FUNCTIONS[$type]) && match ($type) {
+                'finite-float' => \is_float($value) && \is_finite($value),
+                'finite-number' => \is_int($value) || \is_float($value) && \is_finite($value),
+                'number' => \is_int($value) || \is_float($value),
+                default => self::VALIDATION_FUNCTIONS[$type]($value),
+            }) {
                 return;
             }
 

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/TypeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/TypeValidatorTest.php
@@ -88,6 +88,14 @@ public static function getValidValues()
             ['1.5', 'numeric'],
             [0, 'integer'],
             [1.5, 'float'],
+            [\NAN, 'float'],
+            [\INF, 'float'],
+            [1.5, 'finite-float'],
+            [0, 'number'],
+            [1.5, 'number'],
+            [\NAN, 'number'],
+            [\INF, 'number'],
+            [1.5, 'finite-number'],
             ['12345', 'string'],
             [[], 'array'],
             [$object, 'object'],
@@ -135,7 +143,16 @@ public static function getInvalidValues()
             ['foobar', 'numeric', '"foobar"'],
             ['foobar', 'boolean', '"foobar"'],
             ['0', 'integer', '"0"'],
+            [\NAN, 'integer', 'NAN'],
+            [\INF, 'integer', 'INF'],
             ['1.5', 'float', '"1.5"'],
+            ['1.5', 'finite-float', '"1.5"'],
+            [\NAN, 'finite-float', 'NAN'],
+            [\INF, 'finite-float', 'INF'],
+            ['0', 'number', '"0"'],
+            ['0', 'finite-number', '"0"'],
+            [\NAN, 'finite-number', 'NAN'],
+            [\INF, 'finite-number', 'INF'],
             [12345, 'string', '12345'],
             [$object, 'boolean', 'object'],
             [$object, 'numeric', 'object'],