avoid unnessary array_merge calls

Author: digitalkaoz

src/JsonSchema/Constraints/Constraint.php

@@ -37,33 +37,19 @@ abstract class Constraint implements ConstraintInterface
     private $factory;
 
     /**
-     * @param int $checkMode
-     * @param SchemaStorage $schemaStorage
-     * @param UriRetrieverInterface $uriRetriever
      * @param Factory $factory
      */
-    public function __construct(
-        $checkMode = self::CHECK_MODE_NORMAL,
-        SchemaStorage $schemaStorage = null,
-        UriRetrieverInterface $uriRetriever = null,
-        Factory $factory = null
-    ) {
-        $this->checkMode     = $checkMode;
-        $this->uriRetriever  = $uriRetriever;
-        $this->factory       = $factory;
-        $this->schemaStorage = $schemaStorage;
+    public function __construct(Factory $factory = null)
+    {
+        $this->factory = $factory;
     }
 
     /**
      * @return UriRetrieverInterface $uriRetriever
      */
     public function getUriRetriever()
     {
-        if (is_null($this->uriRetriever)) {
-            $this->setUriRetriever(new UriRetriever);
-        }
-
-        return $this->uriRetriever;
+        return $this->getFactory()->getUriRetriever();
     }
 
     /**
@@ -72,7 +58,7 @@ public function getUriRetriever()
     public function getFactory()
     {
         if (!$this->factory) {
-            $this->factory = new Factory($this->getSchemaStorage(), $this->getUriRetriever(), $this->checkMode);
+            $this->factory = new Factory();
         }
 
         return $this->factory;
@@ -83,19 +69,7 @@ public function getFactory()
      */
     public function getSchemaStorage()
     {
-        if (is_null($this->schemaStorage)) {
-            $this->schemaStorage = new SchemaStorage($this->getUriRetriever());
-        }
-
-        return $this->schemaStorage;
-    }
-
-    /**
-     * @param UriRetrieverInterface $uriRetriever
-     */
-    public function setUriRetriever(UriRetrieverInterface $uriRetriever)
-    {
-        $this->uriRetriever = $uriRetriever;
+        return $this->getFactory()->getSchemaStorage();
     }
 
     /**
@@ -123,7 +97,9 @@ public function addError(JsonPointer $path = null, $message, $constraint='', arr
      */
     public function addErrors(array $errors)
     {
-        $this->errors = array_merge($this->errors, $errors);
+        if ($errors) {
+            $this->errors = array_merge($this->errors, $errors);
+        }
     }
 
     /**
@@ -231,7 +207,7 @@ protected function checkType($value, $schema = null, JsonPointer $path = null, $
     protected function checkUndefined($value, $schema = null, JsonPointer $path = null, $i = null)
     {
         $validator = $this->getFactory()->createInstanceFor('undefined');
-        $validator->check($value, $this->schemaStorage->resolveRefSchema($schema), $path, $i);
+        $validator->check($value, $this->getSchemaStorage()->resolveRefSchema($schema), $path, $i);
 
         $this->addErrors($validator->getErrors());
     }

src/JsonSchema/Constraints/Factory.php

@@ -37,7 +37,7 @@ class Factory
     /**
      * @var TypeCheck\TypeCheckInterface[]
      */
-    private $typeCheck = array();
+    public static $typeCheck = array();
 
     /**
      * @var array $constraintMap
@@ -59,7 +59,7 @@ class Factory
     /**
      * @var array<ConstraintInterface>
      */
-    private $instanceCache = array();
+    public static $instanceCache = array();
 
     /**
      * @param SchemaStorage $schemaStorage
@@ -91,13 +91,13 @@ public function getSchemaStorage()
 
     public function getTypeCheck()
     {
-        if (!isset($this->typeCheck[$this->checkMode])) {
-            $this->typeCheck[$this->checkMode] = $this->checkMode === Constraint::CHECK_MODE_TYPE_CAST
+        if (!isset(self::$typeCheck[$this->checkMode])) {
+            self::$typeCheck[$this->checkMode] = $this->checkMode === Constraint::CHECK_MODE_TYPE_CAST
                 ? new TypeCheck\LooseTypeCheck
                 : new TypeCheck\StrictTypeCheck;
         }
 
-        return $this->typeCheck[$this->checkMode];
+        return self::$typeCheck[$this->checkMode];
     }
 
     /**
@@ -128,17 +128,14 @@ public function setConstraintClass($name, $class)
      */
     public function createInstanceFor($constraintName)
     {
-        if (array_key_exists($constraintName, $this->constraintMap)) {
-            if (!isset($this->instanceCache[$constraintName])) {
-                $this->instanceCache[$constraintName] = new $this->constraintMap[$constraintName](
-                    $this->checkMode,
-                    $this->schemaStorage,
-                    $this->uriRetriever,
-                    $this
-                );
-            }
-            return clone $this->instanceCache[$constraintName];
+        if (!isset($this->constraintMap[$constraintName])) {
+            throw new InvalidArgumentException('Unknown constraint ' . $constraintName);
         }
-        throw new InvalidArgumentException('Unknown constraint ' . $constraintName);
+
+        if (!isset(self::$instanceCache[$constraintName])) {
+            self::$instanceCache[$constraintName] = new $this->constraintMap[$constraintName]($this);
+        }
+
+        return clone self::$instanceCache[$constraintName];
     }
 }

src/JsonSchema/Constraints/ObjectConstraint.php

@@ -144,7 +144,7 @@ public function validateDefinition($element, $objectDefinition = null, JsonPoint
     protected function getProperty($element, $property, $fallback = null)
     {
         if (is_array($element) /*$this->checkMode == self::CHECK_MODE_TYPE_CAST*/) {
-            return array_key_exists($property, $element) ? $element[$property] : $fallback;
+            return isset($element[$property]) ? $element[$property] : $fallback;
         } elseif (is_object($element)) {
             return property_exists($element, $property) ? $element->$property : $fallback;
         }

src/JsonSchema/Validator.php

@@ -9,7 +9,6 @@
 
 namespace JsonSchema;
 
-use JsonSchema\Constraints\SchemaConstraint;
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Entity\JsonPointer;