Ajustes.

Author: tarcisio-softbox

src/AttributeAccessors/ArrayAttributeWrapper.php

@@ -74,12 +74,14 @@ protected function appendAttrToFailMessages($index, $failMsgs) {
      * @return boolean
      */
     public function validate($target) {
-        $ret = array();
+        if (!is_array($target)) {
+            return $this->validateRule->validate(AttributeNotExists::instance());
+        }
 
-        $total = count($target);
+        $ret = array();
 
-        for ($i = 0; $i < $total; $i++) {
-            $ret = array_merge($ret, $this->appendAttrToFailMessages($i, $this->validateRule->validate(isset($target[$i]) ? $target[$i] : null)));
+        foreach ($target as $key => $value) {
+            $ret = array_merge($ret, $this->appendAttrToFailMessages($key, $this->validateRule->validate($value)));
         }
 
         return $ret;

src/AttributeAccessors/ArrayNestedAttributeWrapper.php

@@ -61,16 +61,14 @@ protected function appendAttrToFailMessages($index, $failMsgs) {
     }
 
     public function validate($target) {
-        if ($target == null) {
-            return parent::validate(null);
+        if (!is_array($target)) {
+            return parent::validate(AttributeNotExists::instance());
         }
 
         $ret = array();
 
-        $total = count($target);
-
-        for ($i = 0; $i < $total; $i++) {
-            $ret = array_merge($ret, $this->appendAttrToFailMessages($i, parent::validate($target[$i])));
+        foreach ($target as $key => $value) {
+            $ret = array_merge($ret, $this->appendAttrToFailMessages($key, parent::validate($value)));
         }
 
         return $ret;

src/AttributeAccessors/AttributeNotExists.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace ArrayUtils\AttributeAccessors;
+
+class AttributeNotExists {
+    private static $instance;
+
+    public static final function instance() {
+        if (!static::$instance) {
+            static::$instance = new AttributeNotExists();
+        }
+
+        return static::$instance;
+    }
+}

src/AttributeAccessors/AttributeWrapper.php

@@ -107,6 +107,10 @@ public function validate($target) {
      * @return mixed|null
      */
     protected function get($target) {
-        return isset($target[$this->attribute]) ? $target[$this->attribute] : null;
+        if (!array_key_exists($this->attribute, $target)) {
+            return AttributeNotExists::instance();
+        }
+
+        return $target[$this->attribute];
     }
 }

src/AttributeAccessors/NestedAttribute.php

@@ -22,7 +22,6 @@ public function setValue(array &$target, $newValue) {
         $this->attributeAccessor->setValue($target, $newValue);
     }
 
-
     public function cast(array $target) {
         return $this->attributeAccessor->cast($target);
     }

src/AttributeAccessors/NestedAttributeWrapper.php

@@ -16,7 +16,7 @@ public function __construct($attribute, AttributeAccessor $attributeAccessor) {
     }
 
     public function getValue(array $target) {
-        if (!isset($target[$this->attribute])) {
+        if (!array_key_exists($this->attribute, $target)) {
             return null;
         }
 
@@ -41,8 +41,21 @@ public function cast(array $target) {
         return $target;
     }
 
+    /**
+     * @param array $target
+     *
+     * @return mixed|null
+     */
+    protected function get($target) {
+        if (!array_key_exists($this->attribute, $target)) {
+            return AttributeNotExists::instance();
+        }
+
+        return $target[$this->attribute];
+    }
+
     public function validate($target) {
-        $ret = parent::validate(isset($target[$this->attribute]) ? $target[$this->attribute] : null);
+        $ret = parent::validate($this->get($target));
 
         foreach ($ret as &$failMsg) {
             $failMsg = $this->attribute . "." . $failMsg;

src/ValidationRules/DateValidation.php

@@ -30,6 +30,9 @@ private function validateWithFormat($value) {
      * @return array
      */
     public function validate($value) {
+        if (!is_string($value) || !is_numeric($value)) {
+            return array("O campo deve ser um valor numérico ou string.");
+        }
         if ($this->format) {
             return $this->validateWithFormat($value);
         }

src/ValidationRules/IsPresentValidation.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace ArrayUtils\ValidationRules;
+
+use ArrayUtils\AttributeAccessors\AttributeNotExists;
+use ArrayUtils\ValidationRule;
+
+class IsPresentValidation implements ValidationRule {
+
+    /**
+     * @return string
+     */
+    public function getIdentifier() {
+        return "present";
+    }
+
+    /**
+     * @param $value
+     *
+     * @return array
+     */
+    public function validate($value) {
+        if ($value instanceof AttributeNotExists) {
+            return array("O campo deve estar presente.");
+        }
+
+        return array();
+    }
+
+    /**
+     * @param mixed $params
+     */
+    public function setParams($params) {
+    }
+}

src/ValidationRules/ValidationRuleFactory.php

@@ -22,7 +22,9 @@ public static function load() {
                 new DateValidation(),
                 new InValidation(),
                 new NotInValidation(),
-                new StringValidation()
+                new StringValidation(),
+                new IsPresentValidation(),
+                new BooleanValidation()
             );
 
             foreach ($classes as $instance) {

test/ValidatorTest.php

@@ -13,25 +13,31 @@ public function testValidator() {
             //->addRule('c', 'required')
             //->addRule('a.b.c', 'required')
             //->addRule('d.e', 'required')
-            ->addRule('f.x.*', 'numeric')
-            ->addRule('w.x.*.a', 'required|numeric|max:5')
-            ->addRule('y.*.a', 'required|numeric|max:5')
+            //->addRule('f.x.*', 'numeric')
+            //->addRule('w.x.*.a', 'required|numeric|max:5')
+            //->addRule('y.*.a', 'required|numeric|max:5')
+            //->addRule('*', 'required|numeric|max:5')
+            ->addRule("a.b.*.c", 'present|required')
         ;
 
         $valores = [];
 
-        for ($i = 0; $i < 5; $i++) {
-            $valores[] = ["a" => $i];
+        for ($i = 0; $i < 10; $i++) {
+            //$valores[] = ["a" => $i];
+            $valores[] = $i;
         }
 
-        $ret = $validator->validate([
-            'c' => 10,
-            'a' => ['b' => 1],
-            'd' => ['e' => []],
-            'f' => ['x' => [1, 2, 3, '23x']],
-            'w' => ['x' => [["a" => "1"], ["a" => "1"], ["a" => "20"]]],
-            'y' => $valores
-        ]);
+        //$ret = $validator->validate([
+        //    'c' => 10,
+        //    'a' => ['b' => 1],
+        //    'd' => ['e' => []],
+        //    'f' => ['x' => [1, 2, 3, '23x']],
+        //    'w' => ['x' => [["a" => "1"], ["a" => "1"], ["a" => "20"]]],
+        //    'y' => $valores
+        //]);
+        //$ret = $validator->validate($valores);
+
+        $ret = $validator->validate(["a" => ["b" => [["c" => null]]]]);
 
         print_r($ret);