Merge pull request #973 from creative-commoners/pulls/4/webonyx

MNT Compatibility with webonyx/graphql-php v14
silverstripe · Apr 13, 2022 · 3c296e3 · 3c296e3
2 parents 3fe3c41 + 9a11240
commit 3c296e3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/tests/GraphQL/DuplicateElementMutationTest.php b/tests/GraphQL/DuplicateElementMutationTest.php
@@ -5,7 +5,7 @@
 use DNADesign\Elemental\GraphQL\DuplicateElementMutation;
 use DNADesign\Elemental\Models\BaseElement;
 use DNADesign\Elemental\Models\ElementalArea;
-use GraphQL\Type\Definition\ResolveInfo;
+use DNADesign\Elemental\Tests\GraphQL\FakeResolveInfo;
 use InvalidArgumentException;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Security\Security;
@@ -62,7 +62,7 @@ public function canCreate($member = null, $context = [])
             $object = null;
             $args = ['id' => $element->ID];
             $context = ['currentUser' => Security::getCurrentUser()];
-            $resolveInfo = new ResolveInfo([]);
+            $resolveInfo = new FakeResolveInfo();
 
             $this->expectException(InvalidArgumentException::class);
             $this->expectExceptionMessageRegExp("#insufficient permission to {$operation}#");

diff --git a/tests/GraphQL/FakeResolveInfo.php b/tests/GraphQL/FakeResolveInfo.php
@@ -1,13 +1,32 @@
 <?php
 
-
 namespace DNADesign\Elemental\Tests\GraphQL;
 
+use GraphQL\Type\Definition\FieldDefinition;
 use GraphQL\Type\Definition\ResolveInfo;
+use GraphQL\Type\Definition\ObjectType;
+use GraphQL\Type\Definition\Type;
+use GraphQL\Type\Schema;
 
 class FakeResolveInfo extends ResolveInfo
 {
     public function __construct()
     {
+        // webonyx/graphql-php v0.12
+        if (!property_exists(__CLASS__, 'fieldDefinition')) {
+            return;
+        }
+        // webonyx/graphql-php v14
+        parent::__construct(
+            FieldDefinition::create(['name' => 'fake', 'type' => Type::string()]),
+            [],
+            new ObjectType(['name' => 'fake']),
+            [],
+            new Schema([]),
+            [],
+            '',
+            null,
+            []
+        );
     }
 }
diff --git a/tests/GraphQL/Legacy/AddElementToAreaMutationTest.php b/tests/GraphQL/Legacy/AddElementToAreaMutationTest.php
@@ -4,8 +4,8 @@
 
 use DNADesign\Elemental\GraphQL\AddElementToAreaMutation;
 use DNADesign\Elemental\Models\ElementalArea;
+use DNADesign\Elemental\Tests\GraphQL\FakeResolveInfo;
 use DNADesign\Elemental\Tests\Src\TestElement;
-use GraphQL\Type\Definition\ResolveInfo;
 use InvalidArgumentException;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\GraphQL\Schema\Schema;
@@ -81,7 +81,7 @@ protected function runMutation($className, $elementalAreaID, $afterElementId = n
     {
         $mutation = new AddElementToAreaMutation();
         $context = ['currentUser' => Security::getCurrentUser()];
-        $resolveInfo = new ResolveInfo([]);
+        $resolveInfo = new FakeResolveInfo();
 
         $args = [
             'className' => $className,

diff --git a/tests/GraphQL/Legacy/SortBlockMutationCreatorTest.php b/tests/GraphQL/Legacy/SortBlockMutationCreatorTest.php
@@ -3,8 +3,8 @@
 namespace DNADesign\Elemental\Tests\Legacy\GraphQL;
 
 use DNADesign\Elemental\GraphQL\SortBlockMutationCreator;
+use DNADesign\Elemental\Tests\GraphQL\FakeResolveInfo;
 use DNADesign\Elemental\Tests\Src\TestElement;
-use GraphQL\Type\Definition\ResolveInfo;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\GraphQL\Schema\Schema;
 use SilverStripe\Security\Security;
@@ -56,7 +56,7 @@ protected function runMutation($id, $afterBlockId)
 
         $mutation = new SortBlockMutationCreator();
         $context = ['currentUser' => $member];
-        $resolveInfo = new ResolveInfo([]);
+        $resolveInfo = new FakeResolveInfo();
 
         $mutation->resolve(null, [
             'id' => $id,