From 76a393eec21b4a1a873ad20b97b3af94a6b559e3 Mon Sep 17 00:00:00 2001
From: Klaus Purer <klaus.purer@protonmail.ch>
Date: Mon, 11 Jul 2022 15:51:48 +0200
Subject: [PATCH] refactor(dataproducer): ContextAwarePluginBase got removed,
 make it work for Drupal 10

---
 src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php    | 4 ++--
 .../DataProducer/EntityDefinition/EntityDefinition.php        | 4 ++--
 src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields.php   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php b/src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php
index 1a8a6d55a..f9534fdd4 100644
--- a/src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php
+++ b/src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php
@@ -3,7 +3,7 @@
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer;
 
 use Drupal\Component\Plugin\Exception\ContextException;
-use Drupal\Component\Plugin\ContextAwarePluginBase;
+use Drupal\Component\Plugin\PluginBase;
 use Drupal\graphql\GraphQL\Execution\FieldContext;
 use Drupal\graphql\Plugin\DataProducerPluginInterface;
 use Drupal\Core\Plugin\ContextAwarePluginTrait;
@@ -11,7 +11,7 @@
 /**
  * Base class for data producers that resolve fields for queries or mutations.
  */
-abstract class DataProducerPluginBase extends ContextAwarePluginBase implements DataProducerPluginInterface {
+abstract class DataProducerPluginBase extends PluginBase implements DataProducerPluginInterface {
   use DataProducerPluginCachingTrait;
   use ContextAwarePluginTrait;
 
diff --git a/src/Plugin/GraphQL/DataProducer/EntityDefinition/EntityDefinition.php b/src/Plugin/GraphQL/DataProducer/EntityDefinition/EntityDefinition.php
index 04b47d2c0..a9c77ea9b 100644
--- a/src/Plugin/GraphQL/DataProducer/EntityDefinition/EntityDefinition.php
+++ b/src/Plugin/GraphQL/DataProducer/EntityDefinition/EntityDefinition.php
@@ -101,8 +101,8 @@ public function __construct(
    *   The entity definition.
    */
   public function resolve(string $entity_type,
-    ?string $bundle = NULL,
-    ?string $field_types = NULL,
+    ?string $bundle,
+    ?string $field_types,
     FieldContext $field_context
   ): EntityTypeInterface {
     if ($bundle) {
diff --git a/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields.php b/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields.php
index 28918033e..937ec4484 100644
--- a/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields.php
+++ b/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields.php
@@ -117,8 +117,8 @@ public function __construct(
    */
   public function resolve(
     EntityTypeInterface $entity_definition,
-    ?array $bundle_context = NULL,
-    ?string $field_types_context = NULL,
+    ?array $bundle_context,
+    ?string $field_types_context,
     FieldContext $field_context
   ): \Iterator {