Fixed issues with $null. Fixed #1

3nr1c · Jul 15, 2015 · 30631c3 · 30631c3
1 parent e72bdb8
commit 30631c3
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "3nr1c/structure",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "license": "MIT",
   "authors": [
     {

diff --git a/src/Structure/ArrayS.php b/src/Structure/ArrayS.php
@@ -75,7 +75,7 @@ public function setCountStrict($countStrict) {
 
     public function check($data = null) {
         if ($this->getNull()) {
-            return is_null($this->data) || ($this->checkType($data) && $this->checkFormat($data));
+            return (is_null($this->data) || $this->checkType($data)) && $this->checkFormat($data);
         } else {
             return $this->checkType($data) && $this->checkFormat($data);
         }
@@ -141,7 +141,7 @@ protected function checkFormat($data = null) {
         if ($associativeData && $associativeFormat) {
             foreach ($this->getFormat() as $key=>$value) {
                 if (!array_key_exists($key, $this->data)) {
-                    $valid = false;
+                    $valid = $this->getNull();
                 } else {
                     $valid = $this->checkValue($this->data[$key], $value);
                 }
@@ -185,6 +185,7 @@ protected function checkValue($data, $format, $applyFormat = false) {
                         break;
                 }
                 /** @var NumericS $structure */
+                $structure->setNull($this->getNull());
                 $structure->setRange(preg_replace("/^(numeric|float|integer)/", "", $format));
                 if ($applyFormat) {
                     return $structure->format($data);
@@ -288,8 +289,12 @@ protected function applyFormat() {
 
         if ($associativeData && $associativeFormat) {
             foreach ($this->getFormat() as $key=>$value) {
-                if (!array_key_exists($key, $this->data) && !$this->null) {
-                    throw new \Exception("Non existent key '" . $key . "'");
+                if (!array_key_exists($key, $this->data)) {
+                    if ($this->null) {
+                        $this->data[$key] = null;
+                    } else {
+                        throw new \Exception("Undefined key '" . $key . "'");
+                    }
                 } else {
                     $this->data[$key] = $this->checkValue($this->data[$key], $value, true);
                 }

diff --git a/src/Structure/FloatS.php b/src/Structure/FloatS.php
@@ -27,6 +27,9 @@ public function __construct($data = null, $null = false) {
      * @return float
      */
     public function format($data = null) {
-        return floatval($data);
+        $data = parent::format($data);
+
+        if (!is_null($data)) return floatval($data);
+        else return null;
     }
 }
diff --git a/src/Structure/IntegerS.php b/src/Structure/IntegerS.php
@@ -27,6 +27,9 @@ public function __construct($data = null, $null = false) {
      * @return int
      */
     public function format($data = null) {
-        return intval($data);
+        $data = parent::format($data);
+
+        if (!is_null($data)) return intval($data);
+        else return null;
     }
 }
diff --git a/src/Structure/NumericS.php b/src/Structure/NumericS.php
@@ -149,7 +149,7 @@ protected function checkRange($data = null) {
      */
     public function check($data = null) {
         if ($this->getNull()) {
-            return is_null($this->data) || ($this->checkType($data) && $this->checkRange($data));
+            return (is_null($this->data) || $this->checkType($data)) && $this->checkRange($data);
         } else {
             return $this->checkType($data) && $this->checkRange($data);
         }
@@ -167,14 +167,26 @@ public function format($data = null) {
         if ($validType && $validRange) {
             return $data;
         } else if ($validType && !$validRange) {
-            throw new \Exception("Unable to format " . $this->getType() . " to range" . $this->getRange());
+
+            if ($this->getNull()) {
+                return null;
+            } else {
+                throw new \Exception("Unable to format " . $this->getType() . " to range" . $this->getRange());
+            }
+
         } else if (!$validType) {
             if (!settype($data, $this->getType())) {
                 $data = (float)$data;
             }
             $validRange = $this->checkRange($data);
-            if ($validRange) return $data;
-            else throw new \Exception("Unable to format " . $this->getType() . " to range" . $this->getRange());
+
+            if ($validRange) {
+                return $data;
+            } else if ($this->getNull()) {
+                return null;
+            } else {
+                throw new \Exception("Unable to format " . $this->getType() . " to range" . $this->getRange());
+            }
         }
     }
 }
diff --git a/tests/ArrayFormatTest.php b/tests/ArrayFormatTest.php
@@ -44,4 +44,24 @@ public function testFormat2() {
 
         $this->assertTrue($formatter->check($newArray));
     }
+
+    public function testFormat3() {
+        $format = array(
+            "full_name" => "string",
+            "height" => "integer",
+            "weight" => "integer",
+            "gender" => "integer[0,2]"
+        );
+        $formatter = \Structure\Structure::ArrayS($format, null, false, true);
+
+        $array = array(
+            "full_name" => "My Name",
+            "height" => 175,
+            "gender" => "-1"
+        );
+
+        $this->assertFalse($formatter->check($array));
+        $newArray = $formatter->format($array);
+        $this->assertTrue($formatter->check($newArray));
+    }
 }