Added strict mode support

Author: bixuehujin

src/Validator.php

@@ -10,12 +10,17 @@
 class Validator
 {
     protected $types = [];
+    protected $strict;
 
     /**
      * Constructor.
+     *
+     * @param $options
      */
-    public function __construct()
+    public function __construct(array $options = [])
     {
+        $this->strict = $options['strict'] ?? false;
+
         $this->types = $this->getBuiltInTypeValidators();
     }
 
@@ -111,7 +116,6 @@ protected function getNormalizedPath()
     {
         return strtr(implode('.', $this->path), [
             '.[' => '[',
-            '].' => ']',
         ]);
     }
 
@@ -180,17 +184,54 @@ protected function matchArray(array $data, $definition)
 
     protected function matchObject($data, $definition)
     {
+        if ($this->strict && !$this->matchObjectKeys($data, $definition)) {
+            return false;
+        }
+
+        $hasErrors = false;
         foreach ($definition as $name => $type) {
             array_push($this->path, $name);
             $result = $this->matchInternal($data[$name] ?? null, $type);
             array_pop($this->path);
 
             if (!$result) {
-                return false;
+                $hasErrors = true;
             }
         }
 
-        return true;
+        return !$hasErrors;
+    }
+
+    protected function matchObjectKeys($data, $definition)
+    {
+        $requiredKeys = array_keys($definition);
+        $providedKeys = array_keys($data);
+
+        sort($requiredKeys);
+        sort($providedKeys);
+
+        if ($requiredKeys === $providedKeys) {
+            return true;
+        }
+
+        $absenceKeys     = array_diff($requiredKeys, $providedKeys);
+        $notRequiredKeys = array_diff($providedKeys, $requiredKeys);
+
+        $message = "The object keys doesn't match the type definition";
+
+        if ($absenceKeys) {
+            $absenceKeys = implode(',', $absenceKeys);
+            $message .= ": '$absenceKeys' are absent";
+        }
+
+        if ($notRequiredKeys) {
+            $notRequiredKeys = implode(',', $notRequiredKeys);
+            $message .= ": '$notRequiredKeys' are not required";
+        }
+
+        $this->addError($this->getNormalizedPath(), $message);
+
+        return false;
     }
 
     protected function matchInternal($data, $type)

tests/JsonTypeTest.php

@@ -12,9 +12,9 @@
  */
 class JsonTypeTest extends PHPUnit_Framework_TestCase
 {
-    protected function createValidator()
+    protected function createValidator($strictMode = false)
     {
-        $validator = new Validator();
+        $validator = new Validator(['strict' => $strictMode]);
 
         $validator->addType('timestamp', $this->timestampValidator());
 
@@ -202,4 +202,30 @@ public function testErrorMessages($value, $type, $key, $message)
         $this->assertFalse($json->matches($value, $type));
         $this->assertEquals($message, $json->getErrors()[$key] ?? '');
     }
+
+    public function typeStrictData()
+    {
+        return [
+            [
+                ['key1' => 'v1', 'key3' => 'v3'],
+                [
+                    'key1' => 'string',
+                    'key2' => 'string',
+                ],
+                '$',
+                "The object keys doesn't match the type definition: 'key2' are absent: 'key3' are not required",
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider typeStrictData
+     */
+    public function testStrictMode($value, $type, $key, $message)
+    {
+        $json = $this->createValidator(true);
+
+        $this->assertFalse($json->matches($value, $type));
+        $this->assertEquals($message, $json->getErrors()[$key] ?? '');
+    }
 }