Merge pull request #19 from Matts/allow-numeric

Allow numeric values for GreaterThan and LessThan
bjd-php · Oct 15, 2020 · b669665 · b669665
2 parents 34b6bb9 + 89e1efe
commit b669665
Show file tree

Hide file tree

Showing 6 changed files with 130 additions and 6 deletions.
diff --git a/Constraint/Constraints/GreaterThan.php b/Constraint/Constraints/GreaterThan.php
@@ -45,7 +45,7 @@ protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
             ->setRequired(['value'])
-            ->setAllowedTypes('value', ['int'])
+            ->setAllowedTypes('value', ['numeric'])
         ;
     }
 }
diff --git a/Constraint/Constraints/LessThan.php b/Constraint/Constraints/LessThan.php
@@ -45,7 +45,7 @@ protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
             ->setRequired(['value'])
-            ->setAllowedTypes('value', ['int'])
+            ->setAllowedTypes('value', ['numeric'])
         ;
     }
 }
diff --git a/Tests/Constraint/Constraints/GreaterThanOrEqualTest.php b/Tests/Constraint/Constraints/GreaterThanOrEqualTest.php
@@ -20,12 +20,13 @@ public function testInvalidConfiguration(): void
         $this->expectException(InvalidOptionsException::class);
 
         new ParsleyAssert\GreaterThanOrEqual([
-            'value' => '5',
+            'value' => 'foo',
         ]);
     }
 
     public function testNormalization(): void
     {
+        // integer
         $constraint = new ParsleyAssert\GreaterThanOrEqual([
             'value' => 5,
         ]);
@@ -34,5 +35,35 @@ public function testNormalization(): void
             'data-parsley-gte' => '5',
             'data-parsley-gte-message' => 'Invalid.',
         ], $constraint->normalize($this->normalizer));
+
+        // float to int
+        $constraint = new ParsleyAssert\GreaterThanOrEqual([
+            'value' => 5.0,
+        ]);
+
+        $this->assertSame([
+            'data-parsley-gte' => '5',
+            'data-parsley-gte-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
+
+        // floating
+        $constraint = new ParsleyAssert\GreaterThanOrEqual([
+            'value' => 5.2,
+        ]);
+
+        $this->assertSame([
+            'data-parsley-gte' => '5.2',
+            'data-parsley-gte-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
+
+        // string
+        $constraint = new ParsleyAssert\GreaterThanOrEqual([
+            'value' => '5',
+        ]);
+
+        $this->assertSame([
+            'data-parsley-gte' => '5',
+            'data-parsley-gte-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
     }
 }
diff --git a/Tests/Constraint/Constraints/GreaterThanTest.php b/Tests/Constraint/Constraints/GreaterThanTest.php
@@ -20,12 +20,13 @@ public function testInvalidConfiguration(): void
         $this->expectException(InvalidOptionsException::class);
 
         new ParsleyAssert\GreaterThan([
-            'value' => '5',
+            'value' => 'foo',
         ]);
     }
 
     public function testNormalization(): void
     {
+        // integer
         $constraint = new ParsleyAssert\GreaterThan([
             'value' => 5,
         ]);
@@ -34,5 +35,35 @@ public function testNormalization(): void
             'data-parsley-gt' => '5',
             'data-parsley-gt-message' => 'Invalid.',
         ], $constraint->normalize($this->normalizer));
+
+        // float to int
+        $constraint = new ParsleyAssert\GreaterThan([
+            'value' => 5.0,
+        ]);
+
+        $this->assertSame([
+            'data-parsley-gt' => '5',
+            'data-parsley-gt-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
+
+        // floating
+        $constraint = new ParsleyAssert\GreaterThan([
+            'value' => 5.2,
+        ]);
+
+        $this->assertSame([
+            'data-parsley-gt' => '5.2',
+            'data-parsley-gt-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
+
+        // string
+        $constraint = new ParsleyAssert\GreaterThan([
+            'value' => '5',
+        ]);
+
+        $this->assertSame([
+            'data-parsley-gt' => '5',
+            'data-parsley-gt-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
     }
 }
diff --git a/Tests/Constraint/Constraints/LessThanOrEqualTest.php b/Tests/Constraint/Constraints/LessThanOrEqualTest.php
@@ -20,12 +20,13 @@ public function testInvalidConfiguration(): void
         $this->expectException(InvalidOptionsException::class);
 
         new ParsleyAssert\LessThanOrEqual([
-            'value' => '10',
+            'value' => 'foo',
         ]);
     }
 
     public function testNormalization(): void
     {
+        // integer
         $constraint = new ParsleyAssert\LessThanOrEqual([
             'value' => 10,
         ]);
@@ -34,5 +35,35 @@ public function testNormalization(): void
             'data-parsley-lte' => '10',
             'data-parsley-lte-message' => 'Invalid.',
         ], $constraint->normalize($this->normalizer));
+
+        // float to int
+        $constraint = new ParsleyAssert\LessThanOrEqual([
+            'value' => 10.0,
+        ]);
+
+        $this->assertSame([
+            'data-parsley-lte' => '10',
+            'data-parsley-lte-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
+
+        // floating
+        $constraint = new ParsleyAssert\LessThanOrEqual([
+            'value' => 10.3,
+        ]);
+
+        $this->assertSame([
+            'data-parsley-lte' => '10.3',
+            'data-parsley-lte-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
+
+        // string
+        $constraint = new ParsleyAssert\LessThanOrEqual([
+            'value' => '10',
+        ]);
+
+        $this->assertSame([
+            'data-parsley-lte' => '10',
+            'data-parsley-lte-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
     }
 }
diff --git a/Tests/Constraint/Constraints/LessThanTest.php b/Tests/Constraint/Constraints/LessThanTest.php
@@ -20,12 +20,13 @@ public function testInvalidConfiguration(): void
         $this->expectException(InvalidOptionsException::class);
 
         new ParsleyAssert\LessThan([
-            'value' => '10',
+            'value' => 'foo',
         ]);
     }
 
     public function testNormalization(): void
     {
+        // integer
         $constraint = new ParsleyAssert\LessThan([
             'value' => 10,
         ]);
@@ -34,5 +35,35 @@ public function testNormalization(): void
             'data-parsley-lt' => '10',
             'data-parsley-lt-message' => 'Invalid.',
         ], $constraint->normalize($this->normalizer));
+
+        // float to int
+        $constraint = new ParsleyAssert\LessThan([
+            'value' => 10.0,
+        ]);
+
+        $this->assertSame([
+            'data-parsley-lt' => '10',
+            'data-parsley-lt-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
+
+        // floating
+        $constraint = new ParsleyAssert\LessThan([
+            'value' => 10.5,
+        ]);
+
+        $this->assertSame([
+            'data-parsley-lt' => '10.5',
+            'data-parsley-lt-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
+
+        // string
+        $constraint = new ParsleyAssert\LessThan([
+            'value' => '10',
+        ]);
+
+        $this->assertSame([
+            'data-parsley-lt' => '10',
+            'data-parsley-lt-message' => 'Invalid.',
+        ], $constraint->normalize($this->normalizer));
     }
 }