Merge pull request #55 from alexmmm/code-cleanup

Code cleanup

Author: justinrainbow

src/JsonSchema/Constraints/Constraint.php

@@ -9,7 +9,7 @@
 
 namespace JsonSchema\Constraints;
 
-use JsonSchema\Uri;
+use JsonSchema\Uri\UriRetriever;
 
 /**
  * The Base Constraints, all Validators should extend this class
@@ -31,7 +31,7 @@ abstract class Constraint implements ConstraintInterface
      * @param int          $checkMode
      * @param UriRetriever $uriRetriever
      */
-    public function __construct($checkMode = self::CHECK_MODE_NORMAL, \JsonSchema\Uri\UriRetriever $uriRetriever = null)
+    public function __construct($checkMode = self::CHECK_MODE_NORMAL, UriRetriever $uriRetriever = null)
     {
         $this->checkMode    = $checkMode;
         $this->uriRetriever = $uriRetriever;
@@ -40,11 +40,11 @@ public function __construct($checkMode = self::CHECK_MODE_NORMAL, \JsonSchema\Ur
 	/**
 	 * @return UriRetriever $uriRetriever
 	 */
-	public function getUriRetriever() 
+	public function getUriRetriever()
 	{
 		if (is_null($this->uriRetriever))
 		{
-			$this->setUriRetriever(new \JsonSchema\Uri\UriRetriever);
+			$this->setUriRetriever(new UriRetriever);
 		}
 
 		return $this->uriRetriever;
@@ -53,7 +53,7 @@ public function getUriRetriever()
     /**
      * @param UriRetriever $uriRetriever
      */
-    public function setUriRetriever(\JsonSchema\Uri\UriRetriever $uriRetriever)
+    public function setUriRetriever(UriRetriever $uriRetriever)
     {
         $this->uriRetriever = $uriRetriever;
     }
@@ -255,7 +255,7 @@ protected function checkFormat($value, $schema = null, $path = null, $i = null)
     protected function retrieveUri($uri)
     {
         if (null === $this->uriRetriever) {
-            $this->setUriRetriever(new \JsonSchema\Uri\UriRetriever);
+            $this->setUriRetriever(new UriRetriever);
         }
 		$jsonSchema = $this->uriRetriever->retrieve($uri);
         // TODO validate using schema

src/JsonSchema/Constraints/Object.php

@@ -75,12 +75,7 @@ public function validateElement($element, $matches, $objectDefinition = null, $p
             $property = $this->getProperty($element, $i, new Undefined());
             $definition = $this->getProperty($objectDefinition, $i);
 
-            //required property
-            if ($this->getProperty($definition, 'required') && $property instanceof Undefined) {
-                $this->addError($path, "the property " . $i . " is required");
-            }
-
-            //no additional properties allowed
+            // no additional properties allowed
             if (!in_array($i, $matches) && $additionalProp === false && $this->inlineSchemaProperty !== $i && !$definition) {
                 $this->addError($path, "The property " . $i . " is not defined and the definition does not allow additional properties");
             }
@@ -96,8 +91,10 @@ public function validateElement($element, $matches, $objectDefinition = null, $p
                 $this->addError($path, "the presence of the property " . $i . " requires that " . $require . " also be present");
             }
 
-            //normal property verification
-            $this->checkUndefined($value, $definition ? : new \stdClass(), $path, $i);
+            if (!$definition) {
+                // normal property verification
+                $this->checkUndefined($value, new \stdClass(), $path, $i);
+            }
         }
     }