Compatibility with Graphpinator 2.0

Author: peldax

infection.json

@@ -11,7 +11,7 @@
         "perMutator": "build/per-mutator.md"
     },
     "tmpDir": "/tmp/infection",
-    "minMsi": 77,
+    "minMsi": 74,
     "minCoveredMsi": 77,
     "mutators": {
         "@default": true,

src/FloatConstraintDirective.php

@@ -4,6 +4,9 @@
 
 namespace Graphpinator\ConstraintDirectives;
 
+use Graphpinator\ConstraintDirectives\Exception\MaxConstraintNotSatisfied;
+use Graphpinator\ConstraintDirectives\Exception\MinConstraintNotSatisfied;
+use Graphpinator\ConstraintDirectives\Exception\OneOfConstraintNotSatisfied;
 use Graphpinator\Normalizer\Variable\Variable;
 use Graphpinator\Typesystem\Argument\Argument;
 use Graphpinator\Typesystem\Argument\ArgumentSet;
@@ -87,15 +90,15 @@ protected function specificValidateValue(
         $oneOf = $arguments->offsetGet('oneOf')->getValue()->getRawValue();
 
         if (\is_float($min) && $rawValue < $min) {
-            throw new Exception\MinConstraintNotSatisfied();
+            throw new MinConstraintNotSatisfied();
         }
 
         if (\is_float($max) && $rawValue > $max) {
-            throw new Exception\MaxConstraintNotSatisfied();
+            throw new MaxConstraintNotSatisfied();
         }
 
         if (\is_array($oneOf) && !\in_array($rawValue, $oneOf, true)) {
-            throw new Exception\OneOfConstraintNotSatisfied();
+            throw new OneOfConstraintNotSatisfied();
         }
     }
 

src/IntConstraintDirective.php

@@ -4,6 +4,9 @@
 
 namespace Graphpinator\ConstraintDirectives;
 
+use Graphpinator\ConstraintDirectives\Exception\MaxConstraintNotSatisfied;
+use Graphpinator\ConstraintDirectives\Exception\MinConstraintNotSatisfied;
+use Graphpinator\ConstraintDirectives\Exception\OneOfConstraintNotSatisfied;
 use Graphpinator\Normalizer\Variable\Variable;
 use Graphpinator\Typesystem\Argument\Argument;
 use Graphpinator\Typesystem\Argument\ArgumentSet;
@@ -86,15 +89,15 @@ protected function specificValidateValue(
         $oneOf = $arguments->offsetGet('oneOf')->getValue()->getRawValue();
 
         if (\is_int($min) && $rawValue < $min) {
-            throw new Exception\MinConstraintNotSatisfied();
+            throw new MinConstraintNotSatisfied();
         }
 
         if (\is_int($max) && $rawValue > $max) {
-            throw new Exception\MaxConstraintNotSatisfied();
+            throw new MaxConstraintNotSatisfied();
         }
 
         if (\is_array($oneOf) && !\in_array($rawValue, $oneOf, true)) {
-            throw new Exception\OneOfConstraintNotSatisfied();
+            throw new OneOfConstraintNotSatisfied();
         }
     }
 

src/ListConstraintDirective.php

@@ -4,6 +4,10 @@
 
 namespace Graphpinator\ConstraintDirectives;
 
+use Graphpinator\ConstraintDirectives\Exception\MaxItemsConstraintNotSatisfied;
+use Graphpinator\ConstraintDirectives\Exception\MinItemsConstraintNotSatisfied;
+use Graphpinator\ConstraintDirectives\Exception\UniqueConstraintNotSatisfied;
+use Graphpinator\ConstraintDirectives\Exception\UniqueConstraintOnlyScalar;
 use Graphpinator\Normalizer\Variable\Variable;
 use Graphpinator\Typesystem\Argument\Argument;
 use Graphpinator\Typesystem\Argument\ArgumentSet;
@@ -105,7 +109,7 @@ private static function recursiveValidateType(
         $usedType = $usedType->getInnerType()->accept(new GetShapingTypeVisitor());
 
         if ($options->unique && !$usedType instanceof LeafType) {
-            throw new Exception\UniqueConstraintOnlyScalar();
+            throw new UniqueConstraintOnlyScalar();
         }
 
         if ($options->innerList instanceof \stdClass) {
@@ -118,11 +122,11 @@ private static function recursiveValidateType(
     private static function recursiveValidate(array $rawValue, \stdClass $options) : void
     {
         if (\is_int($options->minItems) && \count($rawValue) < $options->minItems) {
-            throw new Exception\MinItemsConstraintNotSatisfied();
+            throw new MinItemsConstraintNotSatisfied();
         }
 
         if (\is_int($options->maxItems) && \count($rawValue) > $options->maxItems) {
-            throw new Exception\MaxItemsConstraintNotSatisfied();
+            throw new MaxItemsConstraintNotSatisfied();
         }
 
         if ($options->unique) {
@@ -135,7 +139,7 @@ private static function recursiveValidate(array $rawValue, \stdClass $options) :
                     continue;
                 }
 
-                throw new Exception\UniqueConstraintNotSatisfied();
+                throw new UniqueConstraintNotSatisfied();
             }
         }
 

src/ObjectConstraintDirective.php

@@ -4,6 +4,9 @@
 
 namespace Graphpinator\ConstraintDirectives;
 
+use Graphpinator\ConstraintDirectives\Exception\AtLeastConstraintNotSatisfied;
+use Graphpinator\ConstraintDirectives\Exception\AtMostConstraintNotSatisfied;
+use Graphpinator\ConstraintDirectives\Exception\ExactlyConstraintNotSatisfied;
 use Graphpinator\Typesystem\Argument\Argument;
 use Graphpinator\Typesystem\Argument\ArgumentSet;
 use Graphpinator\Typesystem\Container;
@@ -152,31 +155,31 @@ private static function resolveAtLeast(TypeValue|InputValue $value, array $atLea
             [$currentCount, $notRequested] = self::countFieldsType($value, $atLeast);
 
             if ($currentCount + $notRequested < $count) {
-                throw new Exception\AtLeastConstraintNotSatisfied();
+                throw new AtLeastConstraintNotSatisfied();
             }
 
             return;
         }
 
         if (self::countFieldsInput($value, $atLeast) < $count) {
-            throw new Exception\AtLeastConstraintNotSatisfied();
+            throw new AtLeastConstraintNotSatisfied();
         }
     }
 
     private static function resolveAtMost(TypeValue|InputValue $value, array $atMost, int $count = 1) : void
     {
         if ($value instanceof TypeValue) {
-            [$currentCount, $notRequested] = self::countFieldsType($value, $atMost);
+            [$currentCount] = self::countFieldsType($value, $atMost);
 
             if ($currentCount > $count) {
-                throw new Exception\AtMostConstraintNotSatisfied();
+                throw new AtMostConstraintNotSatisfied();
             }
 
             return;
         }
 
         if (self::countFieldsInput($value, $atMost) > $count) {
-            throw new Exception\AtMostConstraintNotSatisfied();
+            throw new AtMostConstraintNotSatisfied();
         }
     }
 
@@ -186,14 +189,14 @@ private static function resolveExactly(TypeValue|InputValue $value, array $exact
             [$currentCount, $notRequested] = self::countFieldsType($value, $exactly);
 
             if ($currentCount > $count || ($currentCount + $notRequested) < $count) {
-                throw new Exception\ExactlyConstraintNotSatisfied();
+                throw new ExactlyConstraintNotSatisfied();
             }
 
             return;
         }
 
         if (self::countFieldsInput($value, $exactly) !== $count) {
-            throw new Exception\ExactlyConstraintNotSatisfied();
+            throw new ExactlyConstraintNotSatisfied();
         }
     }
 

tests/Integration/ConstraintArgumentTest.php

@@ -141,7 +141,7 @@ public function testArgument(Json $request, Json $expected) : void
         $result = $graphpinator->run(new JsonRequestFactory($request));
 
         self::assertSame($expected->toString(), $result->toString());
-        self::assertNull($result->getErrors());
+        self::assertNull($result->errors);
     }
 
     public static function argumentInvalidDataProvider() : array