Drupal 9 compatibility

graphql.info.yml

@@ -3,4 +3,4 @@ type: module
 description: 'Base module for integrating GraphQL with Drupal.'
 package: GraphQL
 configure: graphql.config_page
-core: 8.x
+core_version_requirement: '^8.7.7 || ^9'

modules/graphql_core/graphql_core.info.yml

@@ -2,6 +2,6 @@ name: GraphQL Core
 type: module
 description: 'Provides type system plugins and derivers on behalf of core modules.'
 package: GraphQL
-core: 8.x
+core_version_requirement: '^8.7.7 || ^9'
 dependencies:
   - graphql

modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/Fields/Image/ImageDerivative.php

@@ -85,7 +85,7 @@ protected function resolveValues($value, array $args, ResolveContext $context, R
         $url = $style->buildUrl($file->getFileUri());
       }
       else {
-        $url = $file->url();
+        $url = $file->toUrl();
       }
 
       yield new CacheableValue([

modules/graphql_core/tests/src/Kernel/Entity/EntityRevisionsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\graphql_core\Kernel\Context;
+namespace Drupal\Tests\graphql_core\Kernel\Entity;
 
 use Drupal\node\Entity\Node;
 use Drupal\Tests\graphql_core\Kernel\GraphQLContentTestBase;

modules/graphql_core/tests/src/Kernel/Images/ImageFieldTest.php

@@ -70,7 +70,7 @@ public function testImageField() {
           'image' => [[
             'alt' => $a->image->alt,
             'title' => $a->image->title,
-            'entity' => ['url' => $a->image->entity->url()],
+            'entity' => ['url' => $a->image->entity->toUrl()],
             'width' => $a->image[0]->width,
             'height' => $a->image[0]->height,
             'thumbnailImage' => [

src/Form/EntityQueryMapImportForm.php

@@ -73,7 +73,7 @@ public function save(array $form, FormStateInterface $formState) {
     $entity->set('map', array_flip((array) json_decode($json)));
     $entity->save();
 
-    drupal_set_message($this->t('Saved the query map version %id.', [
+    $this->messenger()->addStatus($this->t('Saved the query map version %id.', [
       '%id' => $entity->id(),
     ]));
 

src/Routing/QueryRouteEnhancer.php

@@ -3,39 +3,36 @@
 namespace Drupal\graphql\Routing;
 
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Routing\Enhancer\RouteEnhancerInterface;
+use Drupal\Core\Routing\EnhancerInterface;
 use Drupal\graphql\GraphQL\QueryProvider\QueryProviderInterface;
 use Drupal\graphql\Utility\JsonHelper;
 use GraphQL\Server\Helper;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
-class QueryRouteEnhancer implements RouteEnhancerInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies(Route $route) {
-    return $route->hasDefault('_graphql');
-  }
+class QueryRouteEnhancer implements EnhancerInterface {
 
   /**
    * {@inheritdoc}
    */
   public function enhance(array $defaults, Request $request) {
-    $helper = new Helper();
-    $method = $request->getMethod();
-    $body = $this->extractBody($request);
-    $query = $this->extractQuery($request);
-    $operations = $helper->parseRequestParams($method, $body, $query);
-
-    // By default we assume a 'single' request. This is going to fail in the
-    // graphql processor due to a missing query string but at least provides
-    // the right format for the client to act upon.
-    return $defaults + [
-      '_controller' => $defaults['_graphql']['single'],
-      'operations' => $operations,
-    ];
+    $route = $defaults[RouteObjectInterface::ROUTE_OBJECT];
+    if ($route->hasDefault('_graphql')) {
+      $helper = new Helper();
+      $method = $request->getMethod();
+      $body = $this->extractBody($request);
+      $query = $this->extractQuery($request);
+      $operations = $helper->parseRequestParams($method, $body, $query);
+
+      // By default we assume a 'single' request. This is going to fail in the
+      // graphql processor due to a missing query string but at least provides
+      // the right format for the client to act upon.
+      return $defaults + [
+        '_controller' => $defaults['_graphql']['single'],
+        'operations' => $operations,
+      ];
+    }
   }
 
   /**

tests/src/Kernel/Framework/TestFrameworkTest.php

@@ -35,7 +35,7 @@ public function testFieldMock() {
     ]);
 
     $schema = $this->introspect();
-    $this->assertArraySubset([
+    $expectedSubset = [
       'types' => [
         'Query' => [
           'fields' => [
@@ -49,7 +49,11 @@ public function testFieldMock() {
           ],
         ],
       ],
-    ], $schema);
+    ];
+    foreach ($expectedSubset as $key => $value) {
+      $this->assertArrayHasKey($key, $schema);
+      $this->assertSame($value, $schema[$key]);
+    }
 
     $this->assertResults('{ root }', [], [
       'root' => 'test',

tests/src/Kernel/Framework/UploadMutationTest.php

@@ -18,7 +18,8 @@ class UploadMutationTest extends GraphQLTestBase {
    */
   public function testFileUpload() {
     // Create dummy file, since symfony will test if it exists..
-    $file = file_directory_temp() . '/graphql_upload_test.txt';
+    $file = \Drupal::service('file_system')
+      ->getTempDirectory() . '/graphql_upload_test.txt';
     touch($file);
 
     // Mock a mutation that accepts the upload input and just returns

tests/src/Traits/MockGraphQLPluginTrait.php

@@ -372,7 +372,7 @@ protected function mockFieldFactory($definition, $result = NULL, $builder = NULL
    * @param mixed|null $applies
    *   A result for the types "applies" method. Defaults to `TRUE`.
    *
-   * @return \PHPUnit_Framework_MockObject_MockObject
+   * @return \PHPUnit\Framework\MockObject\MockObject
    *   The type mock object.
    */
   protected function mockType($id, array $definition, $applies = TRUE, $builder = NULL) {
@@ -463,7 +463,7 @@ protected function mockInputTypeFactory($definition, $builder) {
    *   A result for this mutation. Can be a value or a callback. If omitted, no
    *   resolve method mock will be attached.
    *
-   * @return \PHPUnit_Framework_MockObject_MockObject
+   * @return \PHPUnit\Framework\MockObject\MockObject
    *   The mutation mock object.
    */
   protected function mockMutation($id, array $definition, $result = NULL, $builder = NULL) {
@@ -513,7 +513,7 @@ protected function mockMutationFactory($definition, $result = NULL, $builder = N
    * @param array $definition
    *   The plugin definition. Will be merged with the interface defaults.
    *
-   * @return \PHPUnit_Framework_MockObject_MockObject
+   * @return \PHPUnit\Framework\MockObject\MockObject
    *   The interface mock object.
    */
   protected function mockInterface($id, array $definition, $builder = NULL) {
@@ -555,7 +555,7 @@ protected function mockInterfaceFactory($definition, $builder = NULL) {
    * @param array $definition
    *   The plugin definition. Will be merged with the union defaults.
    *
-   * @return \PHPUnit_Framework_MockObject_MockObject
+   * @return \PHPUnit\Framework\MockObject\MockObject
    *   The union mock object.
    */
   protected function mockUnion($id, array $definition, $builder = NULL) {