Added infinities for ArrayS

3nr1c · Jul 27, 2015 · 02dcb9c · 02dcb9c
1 parent 0abccc3
commit 02dcb9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Structure/ArrayS.php b/src/Structure/ArrayS.php
@@ -166,7 +166,7 @@ protected function checkFormat($data = null) {
      * @throws \Exception
      */
     protected function checkValue($data, $format, $applyFormat = false) {
-        $numeric = '/^(numeric|float|integer|int)(\(|\[)-?\d+(\.\d+)?,-?\d+(\.\d+)?(\)|\])$/';
+        $numeric = '/^(numeric|float|integer|int)(\(|\[).+,.+(\)|\])$/';
         $valueSetScalar = '/^(scalar|string|float|integer|int|str|boolean|bool|numeric)\{[^}]*\}$/';
 
         if (is_null($data)) {

diff --git a/tests/ArrayTest.php b/tests/ArrayTest.php
@@ -311,4 +311,14 @@ public function testValueSets2() {
             }
         }
     }
+
+    public function testInfinities() {
+        $format = array(
+            "foo" => "numeric(0, +inf)"
+        );
+        $array = \Structure\Structure::ArrayS($format);
+        $this->assertTrue($array->check(array("foo" => "3")));
+        $this->assertFalse($array->check(array("foo" => "-1")));
+        $this->assertFalse($array->check(array("foo" => "0")));
+    }
 }