Fixed can't generate correct error message for custom callable type

Author: bixuehujin

src/Validator.php

@@ -38,22 +38,27 @@ protected function getBuiltInTypeValidators()
 
         $validators = [];
         foreach ($types as $type => $func) {
-            $validators[$type] = function ($value) use ($func, $type) {
-                if ($func($value))  {
-                    return true;
-                }
+            $validators[$type] = $this->createValidator($type, $func);
+        }
 
-                $givenType = $this->getType($value);
+        return $validators;
+    }
+
+    protected function createValidator($type, callable $callable)
+    {
+        return function ($value) use ($callable, $type) {
+            if ($callable($value)) {
+                return true;
+            }
 
-                $path = $this->getNormalizedPath();
+            $givenType = $this->getType($value);
 
-                $this->addError($path, "The path of '$path' requires to be a $type, $givenType is given");
+            $path = $this->getNormalizedPath();
 
-                return false;
-            };
-        }
+            $this->addError($path, "The path of '$path' requires to be a $type, $givenType is given");
 
-        return $validators;
+            return false;
+        };
     }
 
     protected function isNumber($data)
@@ -96,7 +101,7 @@ public function addType(string $type, $definition)
             throw new \InvalidArgumentException("The type: $type is already exists");
         }
 
-        $this->types[$type] = $this->buildTypeValidator($definition);
+        $this->types[$type] = $this->buildTypeValidator($type, $definition);
     }
 
     protected $errors = [];
@@ -139,10 +144,10 @@ public function matches($data, $type)
         return $this->matchInternal($data, $type);
     }
 
-    protected function buildTypeValidator($definition)
+    protected function buildTypeValidator($type, $definition)
     {
         if (is_callable($definition)) {
-            $validator = $definition;
+            $validator = $this->createValidator($type, $definition);
         } else if ($this->isObject($definition)) {
             $validator = function ($data) use ($definition) {
                 return $this->matchObject($data, $definition);

tests/JsonTypeTest.php

@@ -14,7 +14,11 @@ class JsonTypeTest extends PHPUnit_Framework_TestCase
 {
     protected function createValidator()
     {
-        return new Validator();
+        $validator = new Validator();
+
+        $validator->addType('timestamp', $this->timestampValidator());
+
+        return $validator;
     }
 
     public function basicTypes()
@@ -90,19 +94,23 @@ public function testMatchArrayOfCustomType()
         $this->assertTrue($json->matches([$this->userData()], ['user']));
     }
 
-    public function testAddCustomTypeThroughCallable()
+    protected function timestampValidator()
     {
-        $json = $this->createValidator();
-
-        $json->addType('timestamp', function ($value) {
+        return function ($value) {
             if ((!is_string($value) && !is_numeric($value)) || strtotime($value) === false) {
                 return false;
             }
 
             $date = date_parse($value);
 
             return checkdate($date['month'], $date['day'], $date['year']);
-        });
+        };
+    }
+
+    public function testAddCustomTypeThroughCallable()
+    {
+        $json = $this->createValidator();
+
 
         $this->assertTrue($json->matches('2017-01-01 00:00:00', 'timestamp'));
         $this->assertFalse($json->matches('2017-01-91 00:00:00', 'timestamp'));
@@ -166,6 +174,21 @@ public function typeErrorMessages()
                 '$.foo[0]',
                 "The path of '$.foo[0]' requires to be a string, integer is given",
             ],
+
+            // Custom Types
+            [
+                'foo',
+                'timestamp',
+                '$',
+                "The path of '$' requires to be a timestamp, string is given",
+            ],
+            [
+                ['foo' => 'bar'],
+                ['foo' => 'timestamp'],
+                '$.foo',
+                "The path of '$.foo' requires to be a timestamp, string is given",
+            ],
+
         ];
     }