fixed variance check for graphpinator v1.0-rc13

Author: peldax

composer.json

@@ -12,7 +12,7 @@
     }
   ],
   "require": {
-    "infinityloop-dev/graphpinator": "^1.0-rc12",
+    "infinityloop-dev/graphpinator": "^1.0-rc13",
     "infinityloop-dev/utils": "^2.1.2",
     "nette/utils": "^3.2"
   },

composer.lock

@@ -70,18 +70,18 @@ protected function specificValidateVariance(
         \Graphpinator\Value\ArgumentValueSet $smallerSet,
     ) : void
     {
-        $lhs = $biggerSet->getRawValues();
-        $rhs = $smallerSet->getRawValues();
+        $lhs = $biggerSet->getValuesForResolver();
+        $rhs = $smallerSet->getValuesForResolver();
 
-        if (\is_float($lhs->min) && ($rhs->min === null || $rhs->min < $lhs->min)) {
+        if (\is_float($lhs['min']) && ($rhs['min'] === null || $rhs['min'] < $lhs['min'])) {
             throw new \Exception();
         }
 
-        if (\is_float($lhs->max) && ($rhs->max === null || $rhs->max > $lhs->max)) {
+        if (\is_float($lhs['max']) && ($rhs['max'] === null || $rhs['max'] > $lhs['max'])) {
             throw new \Exception();
         }
 
-        if (\is_array($lhs->oneOf) && ($rhs->oneOf === null || !self::varianceValidateOneOf($lhs->oneOf, $rhs->oneOf))) {
+        if (\is_array($lhs['oneOf']) && ($rhs['oneOf'] === null || !self::varianceValidateOneOf($lhs['oneOf'], $rhs['oneOf']))) {
             throw new \Exception();
         }
     }

src/FloatConstraintDirective.php

@@ -70,18 +70,18 @@ protected function specificValidateVariance(
         \Graphpinator\Value\ArgumentValueSet $smallerSet,
     ) : void
     {
-        $lhs = $biggerSet->getRawValues();
-        $rhs = $smallerSet->getRawValues();
+        $lhs = $biggerSet->getValuesForResolver();
+        $rhs = $smallerSet->getValuesForResolver();
 
-        if (\is_int($lhs->min) && ($rhs->min === null || $rhs->min < $lhs->min)) {
+        if (\is_int($lhs['min']) && ($rhs['min'] === null || $rhs['min'] < $lhs['min'])) {
             throw new \Exception();
         }
 
-        if (\is_int($lhs->max) && ($rhs->max === null || $rhs->max > $lhs->max)) {
+        if (\is_int($lhs['max']) && ($rhs['max'] === null || $rhs['max'] > $lhs['max'])) {
             throw new \Exception();
         }
 
-        if (\is_array($lhs->oneOf) && ($rhs->oneOf === null || !self::varianceValidateOneOf($lhs->oneOf, $rhs->oneOf))) {
+        if (\is_array($lhs['oneOf']) && ($rhs['oneOf'] === null || !self::varianceValidateOneOf($lhs['oneOf'], $rhs['oneOf']))) {
             throw new \Exception();
         }
     }

src/IntConstraintDirective.php

@@ -50,8 +50,8 @@ protected function specificValidateVariance(
     ) : void
     {
         self::recursiveSpecificValidateVariance(
-            $biggerSet->getRawValues(),
-            $smallerSet->getRawValues(),
+            (object) $biggerSet->getValuesForResolver(),
+            (object) $smallerSet->getValuesForResolver(),
         );
     }
 

src/ListConstraintDirective.php

@@ -90,22 +90,22 @@ protected function specificValidateVariance(
         \Graphpinator\Value\ArgumentValueSet $smallerSet,
     ) : void
     {
-        $lhs = $biggerSet->getRawValues();
-        $rhs = $smallerSet->getRawValues();
+        $lhs = $biggerSet->getValuesForResolver();
+        $rhs = $smallerSet->getValuesForResolver();
 
-        if (\is_int($lhs->minLength) && ($rhs->minLength === null || $rhs->minLength < $lhs->minLength)) {
+        if (\is_int($lhs['minLength']) && ($rhs['minLength'] === null || $rhs['minLength'] < $lhs['minLength'])) {
             throw new \Exception();
         }
 
-        if (\is_int($lhs->maxLength) && ($rhs->maxLength === null || $rhs->maxLength > $lhs->maxLength)) {
+        if (\is_int($lhs['maxLength']) && ($rhs['maxLength'] === null || $rhs['maxLength'] > $lhs['maxLength'])) {
             throw new \Exception();
         }
 
-        if (\is_string($lhs->regex) && ($rhs->regex === null || $rhs->regex !== $lhs->regex)) {
+        if (\is_string($lhs['regex']) && ($rhs['regex'] === null || $rhs['regex'] !== $lhs['regex'])) {
             throw new \Exception();
         }
 
-        if (\is_array($lhs->oneOf) && ($rhs->oneOf === null || !self::varianceValidateOneOf($lhs->oneOf, $rhs->oneOf))) {
+        if (\is_array($lhs['oneOf']) && ($rhs['oneOf'] === null || !self::varianceValidateOneOf($lhs['oneOf'], $rhs['oneOf']))) {
             throw new \Exception();
         }
     }

src/StringConstraintDirective.php

@@ -15,7 +15,13 @@ public function testMissingBiggerSet() : void
 
         \assert($directive instanceof \Graphpinator\Directive\Directive);
 
-        $values = \Graphpinator\Value\ArgumentValueSet::fromRaw([], $directive->getArguments());
+        $values = new \Graphpinator\Value\ArgumentValueSet(
+            (array) \Graphpinator\Value\ConvertRawValueVisitor::convertArgumentSet(
+                $directive->getArguments(),
+                new \stdClass(),
+                new \Graphpinator\Common\Path(),
+            ),
+        );
 
         $directive->validateVariance(null, $values);
     }
@@ -27,7 +33,13 @@ public function testMissingSmallerSet() : void
         $directive = TestSchema::getType('stringConstraint');
         \assert($directive instanceof \Graphpinator\Directive\Directive);
 
-        $values = \Graphpinator\Value\ArgumentValueSet::fromRaw([], $directive->getArguments());
+        $values = new \Graphpinator\Value\ArgumentValueSet(
+            (array) \Graphpinator\Value\ConvertRawValueVisitor::convertArgumentSet(
+                $directive->getArguments(),
+                new \stdClass(),
+                new \Graphpinator\Common\Path(),
+            ),
+        );
 
         $directive->validateVariance($values, null);
     }