refactor(dataproducer): ContextAwarePluginBase got removed, make it work for Drupal 10 (#1296)

Author: klausi

src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php

@@ -3,15 +3,15 @@
 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;
 
 /**
  * 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;
 

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) {

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 {