schema only passes non-null values to prop validation. fixes #6

.travis.yml

@@ -1,20 +1,21 @@
 language: php
-
 php:
   - 5.6
   - 7.0
   - nightly
-
-matrix:
-  allow_failures:
-    - php: nightly
-
 before_script:
-  - composer self-update
   - composer install
-
 script:
   - composer test
-
+  - composer code-sniffer
 after_script:
   - php vendor/bin/coveralls -v
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#honeybee"
+    on_success: always
+    on_failure: always
+    use_notice: false
+    skip_join: false
+

composer.json

@@ -2,6 +2,12 @@
     "name": "shrink0r/php-schema",
     "description": "Lib for building and validating array structures in php.",
     "keywords": [ "schema", "validation" ],
+    "support": {
+        "issues": "https://github.com/shrink0r/php-schema/issues",
+        "wiki": "https://github.com/shrink0r/php-schema/wiki",
+        "irc": "irc://irc.freenode.org/honeybee",
+        "source": "https://github.com/shrink0r/php-schema"
+    },
     "license": "MIT",
     "require": {
         "php": ">=5.6.1"

src/Ok.php

@@ -23,7 +23,7 @@ public static function unit($data = null)
     {
         $class = static::class;
 
-        return new $class($data ?: []);
+        return new $class($data);
     }
 
     /**

src/Schema.php

@@ -153,7 +153,11 @@ protected function validateMappedValues(array $data)
         foreach (array_diff_key($this->properties, [ ':any_name:' => 1 ]) as $key => $property) {
             $result = $this->selectValue($property, $data);
             if ($result instanceof Ok) {
-                $result = $property->validate($result->unwrap());
+                $value = $result->unwrap();
+                if ($value === null) {
+                    continue;
+                }
+                $result = $property->validate($value);
             }
             if ($result instanceof Error) {
                 $errors[$key] = $result->unwrap();
@@ -175,7 +179,7 @@ protected function selectValue(PropertyInterface $property, array $data)
     {
         $errors = [];
         $key = $property->getName();
-        $value = isset($data[$key]) ? $data[$key] : null;
+        $value = array_key_exists($key, $data) ? $data[$key] : null;
 
         if ($value === null && $property->isRequired()) {
             if (!array_key_exists($key, $data)) {
@@ -201,6 +205,12 @@ protected function validateAnyValues(array $data)
 
         foreach (array_diff_key($data, $this->properties) as $key => $value) {
             if (isset($this->properties[':any_name:'])) {
+                if ($value === null) {
+                    if ($this->properties[':any_name:']->isRequired()) {
+                        $errors[$key] = [ Error::MISSING_VALUE ];
+                    }
+                    continue;
+                }
                 $result = $this->properties[':any_name:']->validate($value);
                 if ($result instanceof Error) {
                     $errors[$key] = $result->unwrap();