Change strict mode to be an argument of matches()

Author: bixuehujin

src/Validator.php

@@ -14,13 +14,9 @@ class Validator
 
     /**
      * Constructor.
-     *
-     * @param $options
      */
-    public function __construct(array $options = [])
+    public function __construct()
     {
-        $this->strict = $options['strict'] ?? false;
-
         $this->types = $this->getBuiltInTypeValidators();
     }
 
@@ -139,12 +135,15 @@ protected function reset()
      *
      * @param $data
      * @param $type
+     * @param $strict
      * @return bool
      */
-    public function matches($data, $type)
+    public function matches($data, $type, $strict = false)
     {
         $this->reset();
 
+        $this->strict = $strict;
+
         return $this->matchInternal($data, $type);
     }
 

tests/JsonTypeTest.php

@@ -12,9 +12,9 @@
  */
 class JsonTypeTest extends PHPUnit_Framework_TestCase
 {
-    protected function createValidator($strictMode = false)
+    protected function createValidator()
     {
-        $validator = new Validator(['strict' => $strictMode]);
+        $validator = new Validator();
 
         $validator->addType('timestamp', $this->timestampValidator());
 
@@ -223,9 +223,9 @@ public function typeStrictData()
      */
     public function testStrictMode($value, $type, $key, $message)
     {
-        $json = $this->createValidator(true);
+        $json = $this->createValidator();
 
-        $this->assertFalse($json->matches($value, $type));
+        $this->assertFalse($json->matches($value, $type, true));
         $this->assertEquals($message, $json->getErrors()[$key] ?? '');
     }