Merge branch 'fix-issue-215'

* fix-issue-215:
  This patch fixes jsonrainbow#215 by ensuring that $value is not just an object but also not an instance of itself. Added a regression test.
  Rebased for jsonrainbow#224

Author: rtucek

src/JsonSchema/Constraints/UndefinedConstraint.php

@@ -166,7 +166,7 @@ protected function validateCommonProperties($value, $schema = null, $path = null
         }
 
         // Verify minimum and maximum number of properties
-        if (is_object($value)) {
+        if (is_object($value) && !($value instanceof UndefinedConstraint)) {
             if (isset($schema->minProperties)) {
                 if (count(get_object_vars($value)) < $schema->minProperties) {
                     $this->addError($path, "Must contain a minimum of " . $schema->minProperties . " properties", 'minProperties', array('minProperties' => $schema->minProperties,));

tests/JsonSchema/Tests/Constraints/MinItemsMaxItemsTest.php

@@ -63,6 +63,30 @@ public function getValidTests()
                     "value":{"type":"array","minItems":2,"maxItems":4}
                   }
                 }'
+            ),
+            // Regression test for issue 215
+            array(
+                '{}',
+                '{
+                  "type": "object",
+                  "additionalProperties": false,
+                  "properties": {
+                    "rooms": {
+                      "type": "object",
+                      "additionalProperties": false,
+                      "minProperties": 1,
+                      "maxProperties": 2,
+                      "properties": {
+                        "size_1": {
+                          "type": "number"
+                        },
+                        "size_2": {
+                          "type": "number"
+                        }
+                      }
+                    }
+                  }
+                }'
             )
         );
     }