add instance cache, remove unnecessary execution paths

Author: narcoticfresh

src/JsonSchema/Constraints/Factory.php

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

src/JsonSchema/Constraints/ObjectConstraint.php

@@ -103,11 +103,6 @@ public function validateElement($element, $matches, $objectDefinition = null, $p
                 $this->addError($path, "The presence of the property " . $i . " requires that " . $require . " also be present", 'requires');
             }
 
-            if (!$definition) {
-                // normal property verification
-                $this->checkUndefined($value, new \stdClass(), $path, $i);
-            }
-
             $property = $this->getProperty($element, $i, new UndefinedConstraint());
             if (is_object($property)) {
                 $this->validateMinMaxConstraint(!($property instanceof UndefinedConstraint) ? $property : $element, $definition, $path);
@@ -127,7 +122,11 @@ public function validateDefinition($element, $objectDefinition = null, $path = n
         foreach ($objectDefinition as $i => $value) {
             $property = $this->getProperty($element, $i, new UndefinedConstraint());
             $definition = $this->getProperty($objectDefinition, $i);
-            $this->checkUndefined($property, $definition, $path, $i);
+
+            if (is_object($definition)) {
+                // Undefined constraint will check for is_object() and quit if is not - so why pass it?
+                $this->checkUndefined($property, $definition, $path, $i);
+            }
         }
     }