Update for D9 Compatibility (drupal-graphql#1000)

Author: mikeethedude

graphql.info.yml

@@ -4,5 +4,6 @@ description: 'Base module for integrating GraphQL with Drupal.'
 package: GraphQL
 configure: graphql.config_page
 core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
   - typed_data:typed_data

src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields.php

@@ -3,6 +3,7 @@
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\EntityDefinition;
 
 use Drupal\Core\Entity\ContentEntityType;
+use Drupal\Core\Entity\EntityFieldManager;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -47,6 +48,13 @@ class Fields extends DataProducerPluginBase implements ContainerFactoryPluginInt
    */
   protected $entityTypeManager;
 
+  /**
+   * The entity field manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityFieldManager
+   */
+  protected $entityFieldManager;
+
   /**
    * {@inheritdoc}
    *
@@ -57,7 +65,8 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('entity_type.manager')
+      $container->get('entity_type.manager'),
+      $container->get('entity_field.manager')
     );
   }
 
@@ -72,17 +81,21 @@ public static function create(ContainerInterface $container, array $configuratio
    *   The plugin definition array.
    * @param \Drupal\Core\Entity\EntityTypeManager $entity_type_manager
    *   The entity type manager service.
+   * @param \Drupal\Core\Entity\EntityFieldManager $entity_field_manager
+   *   The entity field manager service.
    *
    * @codeCoverageIgnore
    */
   public function __construct(
     array $configuration,
     string $plugin_id,
     array $plugin_definition,
-    EntityTypeManager $entity_type_manager
+    EntityTypeManager $entity_type_manager,
+    EntityFieldManager $entity_field_manager
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->entityTypeManager = $entity_type_manager;
+    $this->entityFieldManager = $entity_field_manager;
   }
 
   /**
@@ -115,12 +128,12 @@ public function resolve(
         $key = $bundle_context['key'];
         $id = $entity_definition->id();
         $entity_id = $id . '.' . $id . '.' . $key;
-        $fields = \Drupal::entityManager()->getFieldDefinitions($id, $key);
+        $fields = $this->entityFieldManager->getFieldDefinitions($id, $key);
       }
       else {
         $id = $entity_definition->id();
         $entity_id = $id . '.' . $id . '.default';
-        $fields = \Drupal::entityManager()->getFieldDefinitions($id, $id);
+        $fields = $this->entityFieldManager->getFieldDefinitions($id, $id);
       }
 
       /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $form_display_context */

tests/src/Kernel/Framework/UploadMutationTest.php

@@ -20,7 +20,7 @@ public function testFileUpload() {
       schema {
         mutation: Mutation
       }
-  
+
       type Mutation {
         store(file: Upload!): String
       }
@@ -31,7 +31,7 @@ public function testFileUpload() {
     $this->setUpSchema($schema);
 
     // 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