Merge pull request silverstripe#198 from ntd/pr1

PHP 7.3.0 support (silverstripe#197)
open-sausages · Jan 31, 2019 · c994549 · c994549
2 parents 2e4b121 + 9c6e853
commit c994549
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1903,7 +1903,7 @@ Example middleware to log all mutations (but not queries):
 
 ```php
 <?php
-use GraphQL\Schema;
+use GraphQL\Type\Schema;
 use SilverStripe\GraphQL\Middleware\QueryMiddleware;
 
 class MyMutationLoggingMiddleware implements QueryMiddleware

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "silverstripe/framework": "^4.2",
         "silverstripe/vendor-plugin": "^1.0",
-        "webonyx/graphql-php": "~0.8.0"
+        "webonyx/graphql-php": "~0.12.6"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",

diff --git a/src/Manager.php b/src/Manager.php
@@ -5,7 +5,7 @@
 use InvalidArgumentException;
 use GraphQL\Executor\ExecutionResult;
 use GraphQL\Language\SourceLocation;
-use GraphQL\Schema;
+use GraphQL\Type\Schema;
 use GraphQL\GraphQL;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Extensible;
@@ -352,7 +352,7 @@ public function queryAndReturnResult($query, $params = [])
         $context = $this->getContext();
 
         $last = function ($schema, $query, $context, $params) {
-            return GraphQL::executeAndReturnResult($schema, $query, null, $context, $params);
+            return GraphQL::executeQuery($schema, $query, null, $context, $params);
         };
 
         return $this->callMiddleware($schema, $query, $context, $params, $last);

diff --git a/src/Middleware/CSRFMiddleware.php b/src/Middleware/CSRFMiddleware.php
@@ -2,7 +2,7 @@
 
 namespace SilverStripe\GraphQL\Middleware;
 
-use GraphQL\Schema;
+use GraphQL\Type\Schema;
 use SilverStripe\GraphQL\Middleware\QueryMiddleware;
 use SilverStripe\Security\SecurityToken;
 use Exception;

diff --git a/src/Middleware/HTTPMethodMiddleware.php b/src/Middleware/HTTPMethodMiddleware.php
@@ -2,7 +2,7 @@
 
 namespace SilverStripe\GraphQL\Middleware;
 
-use GraphQL\Schema;
+use GraphQL\Type\Schema;
 use SilverStripe\GraphQL\Middleware\QueryMiddleware;
 use Exception;
 

diff --git a/src/Middleware/QueryMiddleware.php b/src/Middleware/QueryMiddleware.php
@@ -3,7 +3,7 @@
 namespace SilverStripe\GraphQL\Middleware;
 
 use GraphQL\Executor\ExecutionResult;
-use GraphQL\Schema;
+use GraphQL\Type\Schema;
 
 /**
  * Represents middleware for evaluating a graphql query

diff --git a/tests/ManagerTest.php b/tests/ManagerTest.php
@@ -4,8 +4,8 @@
 
 use GraphQL\Error\Error;
 use GraphQL\Language\SourceLocation;
-use GraphQL\Schema;
 use GraphQL\Type\Definition\Type;
+use GraphQL\Type\Schema;
 use InvalidArgumentException;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Injector\Injector;
@@ -188,8 +188,7 @@ public function testQueryWithError()
         $responseData->data = null;
         $responseData->errors = [
             Error::createLocatedError(
-                'Something went wrong',
-                [new SourceLocation(1, 10)]
+                'Something went wrong'
             ),
         ];
         $mock->method('queryAndReturnResult')

diff --git a/tests/Middleware/DummyResponseMiddleware.php b/tests/Middleware/DummyResponseMiddleware.php
@@ -2,7 +2,7 @@
 
 namespace SilverStripe\GraphQL\Tests\Middleware;
 
-use GraphQL\Schema;
+use GraphQL\Type\Schema;
 use SilverStripe\GraphQL\Middleware\QueryMiddleware;
 
 class DummyResponseMiddleware implements QueryMiddleware

diff --git a/tests/Middleware/MiddlewareProcessTestBase.php b/tests/Middleware/MiddlewareProcessTestBase.php
@@ -2,9 +2,9 @@
 
 namespace SilverStripe\GraphQL\Tests\Middleware;
 
-use GraphQL\Schema;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
+use GraphQL\Type\Schema;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\GraphQL\Middleware\QueryMiddleware;