minor changes to better performance; try to minimize calls and if() checks

Author: narcoticfresh

src/JsonSchema/Constraints/Factory.php

@@ -40,6 +40,11 @@ class Factory
         'validator' => 'JsonSchema\Validator',
     );
 
+    /**
+     * @var array<ConstraintInterface>
+     */
+    private $instanceCache = array();
+
     /**
      * @param UriRetriever $uriRetriever
      */
@@ -89,7 +94,14 @@ public function setConstraintClass($name, $class)
     public function createInstanceFor($constraintName)
     {
         if (array_key_exists($constraintName, $this->constraintMap)) {
-          return new $this->constraintMap[$constraintName](Constraint::CHECK_MODE_NORMAL, $this->uriRetriever, $this);
+            if (!isset($this->instanceCache[$constraintName])) {
+                $this->instanceCache[$constraintName] = new $this->constraintMap[$constraintName](
+                    Constraint::CHECK_MODE_NORMAL,
+                    $this->uriRetriever,
+                    $this
+                );
+            }
+            return clone $this->instanceCache[$constraintName];
         }
         throw new InvalidArgumentException('Unknown constraint ' . $constraintName);
     }

src/JsonSchema/Constraints/TypeConstraint.php

@@ -98,45 +98,26 @@ public function check($value = null, $schema = null, $path = null, $i = null)
      */
     protected function validateType($value, $type)
     {
-        //mostly the case for inline schema
         if (!$type) {
+            //mostly the case for inline schema
             return true;
-        }
-
-        if ('integer' === $type) {
+        } elseif ('integer' === $type) {
             return is_int($value);
-        }
-
-        if ('number' === $type) {
+        } elseif ('number' === $type) {
             return is_numeric($value) && !is_string($value);
-        }
-
-        if ('boolean' === $type) {
+        } elseif ('boolean' === $type) {
             return is_bool($value);
-        }
-
-        if ('object' === $type) {
+        } elseif ('object' === $type) {
             return is_object($value);
-            //return ($this::CHECK_MODE_TYPE_CAST == $this->checkMode) ? is_array($value) : is_object($value);
-        }
-
-        if ('array' === $type) {
+        } elseif ('array' === $type) {
             return is_array($value);
-        }
-
-        if ('string' === $type) {
+        } elseif ('string' === $type) {
             return is_string($value);
-        }
-        
-        if ('email' === $type) {
+        } elseif ('email' === $type) {
             return is_string($value);
-        }
-
-        if ('null' === $type) {
+        } elseif ('null' === $type) {
             return is_null($value);
-        }
-
-        if ('any' === $type) {
+        } elseif ('any' === $type) {
             return true;
         }
 

src/JsonSchema/Constraints/UndefinedConstraint.php

@@ -52,29 +52,23 @@ public function check($value, $schema = null, $path = null, $i = null)
      */
     public function validateTypes($value, $schema = null, $path = null, $i = null)
     {
-        // check array
         if (is_array($value)) {
+            // check array
             $this->checkArray($value, $schema, $path, $i);
-        }
-
-        // check object
-        if (is_object($value)) {
+        } elseif (is_object($value)) {
+            // check object
             $this->checkObject(
                 $value,
                 isset($schema->properties) ? $schema->properties : $schema,
                 $path,
                 isset($schema->additionalProperties) ? $schema->additionalProperties : null,
                 isset($schema->patternProperties) ? $schema->patternProperties : null
             );
-        }
-
-        // check string
-        if (is_string($value)) {
+        } elseif (is_string($value)) {
+            // check string
             $this->checkString($value, $schema, $path, $i);
-        }
-
-        // check numeric
-        if (is_numeric($value)) {
+        } elseif (is_numeric($value)) {
+            // check numeric
             $this->checkNumber($value, $schema, $path, $i);
         }