Merge branch '8.x-4.x' into dataproducer-default-value

drupal-graphql · Jun 14, 2024 · d4a35c6 · d4a35c6
2 parents 621a78a + d9ad85d
commit d4a35c6
Show file tree

Hide file tree

Showing 36 changed files with 42 additions and 41 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -107,7 +107,7 @@ jobs:
             jangregor/phpstan-prophecy:^1.0.0 \
             phpstan/phpstan-phpunit:^1.0.0 \
             phpstan/extension-installer:^1.0
-          composer --no-interaction --no-progress --with-all-dependencies upgrade drupal/coder:8.3.23
+          composer --no-interaction --no-progress --with-all-dependencies upgrade drupal/coder:8.3.24
 
       - name: Run PHPStan
         if: ${{ matrix.phpstan == '1' }}

diff --git a/examples/graphql_example/src/Plugin/GraphQL/DataProducer/QueryArticles.php b/examples/graphql_example/src/Plugin/GraphQL/DataProducer/QueryArticles.php
@@ -71,7 +71,7 @@ public function __construct(
     array $configuration,
     $pluginId,
     $pluginDefinition,
-    EntityTypeManagerInterface $entityTypeManager
+    EntityTypeManagerInterface $entityTypeManager,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/GraphQL/Execution/Executor.php b/src/GraphQL/Execution/Executor.php
@@ -150,7 +150,7 @@ public function __construct(
     $root,
     $variables,
     $operation,
-    callable $resolver
+    callable $resolver,
   ) {
     $this->contextsManager = $contextsManager;
     $this->cacheBackend = $cacheBackend;
@@ -191,7 +191,7 @@ public static function create(
     $root,
     $variables,
     $operation,
-    callable $resolver
+    callable $resolver,
   ) {
     return new static(
       $container->get('cache_contexts_manager'),

diff --git a/src/GraphQL/Execution/ExecutorFactory.php b/src/GraphQL/Execution/ExecutorFactory.php
@@ -50,7 +50,7 @@ public function create(
     ResolveContext $context,
     $variables,
     $operation,
-    callable $resolver
+    callable $resolver,
   ) {
     return Executor::create($this->container,
       $adapter,

diff --git a/src/GraphQL/Execution/ResolveContext.php b/src/GraphQL/Execution/ResolveContext.php
@@ -78,7 +78,7 @@ public function __construct(
     OperationParams $operation,
     DocumentNode $document,
     $type,
-    array $config
+    array $config,
   ) {
     $this->addCacheContexts(['user.permissions']);
 

diff --git a/src/GraphQL/Resolver/DefaultValue.php b/src/GraphQL/Resolver/DefaultValue.php
@@ -50,7 +50,7 @@ public function resolve(
     $args,
     ResolveContext $context,
     ResolveInfo $info,
-    FieldContext $field
+    FieldContext $field,
   ) {
     $result = $this->value->resolve($value, $args, $context, $info, $field);
     if ($result === NULL) {

diff --git a/src/GraphQL/Utility/FileUpload.php b/src/GraphQL/Utility/FileUpload.php
@@ -125,7 +125,7 @@ public function __construct(
     ConfigFactoryInterface $config_factory,
     RendererInterface $renderer,
     EventDispatcherInterface $eventDispatcher,
-    ImageFactory $image_factory
+    ImageFactory $image_factory,
   ) {
     /** @var \Drupal\file\FileStorageInterface $file_storage */
     $file_storage = $entityTypeManager->getStorage('file');

diff --git a/src/Plugin/DataProducerPluginManager.php b/src/Plugin/DataProducerPluginManager.php
@@ -66,7 +66,7 @@ public function __construct(
     CacheBackendInterface $resultCacheBackend,
     $pluginInterface,
     $pluginAnnotationName,
-    array $config
+    array $config,
   ) {
     parent::__construct(
       $pluginSubdirectory,

diff --git a/src/Plugin/GraphQL/DataProducer/DataProducerProxy.php b/src/Plugin/GraphQL/DataProducer/DataProducerProxy.php
@@ -98,7 +98,7 @@ public function __construct(
     DataProducerPluginManager $pluginManager,
     RequestStack $requestStack,
     CacheContextsManager $contextsManager,
-    CacheBackendInterface $cacheBackend
+    CacheBackendInterface $cacheBackend,
   ) {
     $this->id = $id;
     $this->mapping = $mapping;

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php
@@ -121,7 +121,7 @@ public function __construct(
     array $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
     EntityRepositoryInterface $entityRepository,
-    EntityBuffer $entityBuffer
+    EntityBuffer $entityBuffer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php
@@ -120,7 +120,7 @@ public function __construct(
     array $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
     EntityRepositoryInterface $entityRepository,
-    EntityUuidBuffer $entityBuffer
+    EntityUuidBuffer $entityBuffer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php
@@ -121,7 +121,7 @@ public function __construct(
     array $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
     EntityRepositoryInterface $entityRepository,
-    EntityBuffer $entityBuffer
+    EntityBuffer $entityBuffer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityQueryBase.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityQueryBase.php
@@ -62,7 +62,7 @@ public function __construct(
     string $pluginId,
     array $pluginDefinition,
     EntityTypeManager $entityTypeManager,
-    AccountProxyInterface $current_user
+    AccountProxyInterface $current_user,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityRendered.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityRendered.php
@@ -86,7 +86,7 @@ public function __construct(
     $pluginId,
     $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
-    RendererInterface $renderer
+    RendererInterface $renderer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageDerivative.php b/src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageDerivative.php
@@ -73,7 +73,7 @@ public function __construct(
     array $configuration,
     $pluginId,
     $pluginDefinition,
-    RendererInterface $renderer
+    RendererInterface $renderer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->renderer = $renderer;

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageUrl.php b/src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageUrl.php
@@ -80,7 +80,7 @@ public function __construct(
     $pluginId,
     $pluginDefinition,
     RendererInterface $renderer,
-    FileUrlGeneratorInterface $fileUrlGenerator
+    FileUrlGeneratorInterface $fileUrlGenerator,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->renderer = $renderer;

diff --git a/src/Plugin/GraphQL/DataProducer/EntityDefinition/EntityDefinition.php b/src/Plugin/GraphQL/DataProducer/EntityDefinition/EntityDefinition.php
@@ -76,7 +76,7 @@ public function __construct(
     array $configuration,
     string $plugin_id,
     array $plugin_definition,
-    EntityTypeManager $entity_type_manager
+    EntityTypeManager $entity_type_manager,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->entityTypeManager = $entity_type_manager;
@@ -100,10 +100,11 @@ public function __construct(
    * @return \Drupal\Core\Entity\EntityTypeInterface
    *   The entity definition.
    */
-  public function resolve(string $entity_type,
+  public function resolve(
+    string $entity_type,
     ?string $bundle,
     ?string $field_types,
-    FieldContext $field_context
+    FieldContext $field_context,
   ): EntityTypeInterface {
     if ($bundle) {
       $bundle_info = \Drupal::service('entity_type.bundle.info')->getBundleInfo($entity_type);

diff --git a/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields.php b/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields.php
@@ -91,7 +91,7 @@ public function __construct(
     string $plugin_id,
     array $plugin_definition,
     EntityTypeManager $entity_type_manager,
-    EntityFieldManager $entity_field_manager
+    EntityFieldManager $entity_field_manager,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->entityTypeManager = $entity_type_manager;
@@ -119,7 +119,7 @@ public function resolve(
     EntityTypeInterface $entity_definition,
     ?array $bundle_context,
     ?string $field_types_context,
-    FieldContext $field_context
+    FieldContext $field_context,
   ): \Iterator {
 
     if ($entity_definition instanceof ContentEntityTypeInterface) {

diff --git a/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/Hidden.php b/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/Hidden.php
@@ -42,7 +42,7 @@ class Hidden extends DataProducerPluginBase {
    */
   public function resolve(
     FieldDefinitionInterface $entity_definition_field,
-    ?EntityFormDisplay $entity_form_display_context
+    ?EntityFormDisplay $entity_form_display_context,
   ): bool {
     if ($entity_form_display_context) {
       $hidden = $entity_form_display_context->get('hidden');

diff --git a/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/Settings.php b/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/Settings.php
@@ -42,7 +42,7 @@ class Settings extends DataProducerPluginBase {
    */
   public function resolve(
     FieldDefinitionInterface $entity_definition_field,
-    ?EntityFormDisplay $entity_form_display_context
+    ?EntityFormDisplay $entity_form_display_context,
   ): \Iterator {
     $settings = $entity_definition_field->getSettings();
 

diff --git a/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/Weight.php b/src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/Weight.php
@@ -42,7 +42,7 @@ class Weight extends DataProducerPluginBase {
    */
   public function resolve(
     FieldDefinitionInterface $entity_definition_field,
-    ?EntityFormDisplay $entity_form_display_context
+    ?EntityFormDisplay $entity_form_display_context,
   ): int {
     if ($entity_form_display_context) {
       $content = $entity_form_display_context->get('content');

diff --git a/src/Plugin/GraphQL/DataProducer/Field/EntityReference.php b/src/Plugin/GraphQL/DataProducer/Field/EntityReference.php
@@ -125,7 +125,7 @@ public function __construct(
     array $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
     EntityRepositoryInterface $entityRepository,
-    EntityBuffer $entityBuffer
+    EntityBuffer $entityBuffer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/Plugin/GraphQL/DataProducer/Field/EntityReferenceLayoutRevisions.php b/src/Plugin/GraphQL/DataProducer/Field/EntityReferenceLayoutRevisions.php
@@ -113,7 +113,7 @@ public function __construct(
     string $pluginId,
     array $pluginDefinition,
     EntityTypeManager $entityTypeManager,
-    EntityRevisionBuffer $entityRevisionBuffer
+    EntityRevisionBuffer $entityRevisionBuffer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/Plugin/GraphQL/DataProducer/Field/EntityReferenceRevisions.php b/src/Plugin/GraphQL/DataProducer/Field/EntityReferenceRevisions.php
@@ -113,7 +113,7 @@ public function __construct(
     string $pluginId,
     array $pluginDefinition,
     EntityTypeManager $entityTypeManager,
-    EntityRevisionBuffer $entityRevisionBuffer
+    EntityRevisionBuffer $entityRevisionBuffer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php b/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php
@@ -88,7 +88,7 @@ public function __construct(
     $pluginId,
     $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
-    EntityBuffer $entityBuffer
+    EntityBuffer $entityBuffer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/Plugin/GraphQL/DataProducer/Routing/RouteLoad.php b/src/Plugin/GraphQL/DataProducer/Routing/RouteLoad.php
@@ -85,7 +85,7 @@ public function __construct(
     $pluginId,
     $pluginDefinition,
     PathValidatorInterface $pathValidator,
-    ?RedirectRepository $redirectRepository = NULL
+    ?RedirectRepository $redirectRepository = NULL,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->pathValidator = $pathValidator;

diff --git a/src/Plugin/GraphQL/DataProducer/Taxonomy/TaxonomyLoadTree.php b/src/Plugin/GraphQL/DataProducer/Taxonomy/TaxonomyLoadTree.php
@@ -115,7 +115,7 @@ public function __construct(
     string $pluginId,
     array $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
-    EntityBuffer $entityBuffer
+    EntityBuffer $entityBuffer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entityTypeManager;

diff --git a/src/Plugin/GraphQL/DataProducer/Taxonomy/TermFieldAutocomplete.php b/src/Plugin/GraphQL/DataProducer/Taxonomy/TermFieldAutocomplete.php
@@ -102,7 +102,7 @@ public function __construct(
     $plugin_definition,
     Connection $database,
     EntityTypeManagerInterface $entity_type_manager,
-    ModuleHandlerInterface $module_handler
+    ModuleHandlerInterface $module_handler,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->database = $database;
@@ -271,7 +271,7 @@ public function resolve(
     ?string $match_string,
     bool $prioritize_start_with,
     int $limit,
-    FieldContext $context
+    FieldContext $context,
   ): ?array {
     if ($limit <= 0) {
       $limit = 10;

diff --git a/src/Plugin/GraphQL/DataProducer/User/PasswordReset.php b/src/Plugin/GraphQL/DataProducer/User/PasswordReset.php
@@ -80,7 +80,7 @@ public function __construct(
     string $plugin_id,
     array $plugin_definition,
     Request $current_request,
-    LoggerChannelInterface $logger
+    LoggerChannelInterface $logger,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->currentRequest = $current_request;

diff --git a/src/Plugin/GraphQL/Schema/SdlSchemaPluginBase.php b/src/Plugin/GraphQL/Schema/SdlSchemaPluginBase.php
@@ -102,7 +102,7 @@ public function __construct(
     CacheBackendInterface $astCache,
     ModuleHandlerInterface $moduleHandler,
     SchemaExtensionPluginManager $extensionManager,
-    array $config
+    array $config,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->inDevelopment = !empty($config['development']);

diff --git a/src/Plugin/GraphQL/SchemaExtension/SdlSchemaExtensionPluginBase.php b/src/Plugin/GraphQL/SchemaExtension/SdlSchemaExtensionPluginBase.php
@@ -53,7 +53,7 @@ public function __construct(
     array $configuration,
     $pluginId,
     array $pluginDefinition,
-    ModuleHandlerInterface $moduleHandler
+    ModuleHandlerInterface $moduleHandler,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->moduleHandler = $moduleHandler;

diff --git a/src/Plugin/PersistedQueryPluginManager.php b/src/Plugin/PersistedQueryPluginManager.php
@@ -36,7 +36,7 @@ public function __construct(
     CacheBackendInterface $definitionCacheBackend,
     $pluginInterface,
     $pluginAnnotationName,
-    array $config
+    array $config,
   ) {
     parent::__construct(
       $pluginSubdirectory,

diff --git a/src/Plugin/SchemaExtensionPluginManager.php b/src/Plugin/SchemaExtensionPluginManager.php
@@ -48,7 +48,7 @@ public function __construct(
     CacheBackendInterface $cacheBackend,
     $pluginInterface,
     $pluginAnnotationName,
-    array $config
+    array $config,
   ) {
     parent::__construct(
       $pluginSubdirectory,

diff --git a/src/Plugin/SchemaPluginManager.php b/src/Plugin/SchemaPluginManager.php
@@ -41,7 +41,7 @@ public function __construct(
     CacheBackendInterface $cacheBackend,
     $pluginInterface,
     $pluginAnnotationName,
-    array $config
+    array $config,
   ) {
     parent::__construct(
       $pluginSubdirectory,

diff --git a/tests/src/Kernel/Framework/UploadFileServiceTest.php b/tests/src/Kernel/Framework/UploadFileServiceTest.php
@@ -339,7 +339,7 @@ protected function getUploadedFile(
     int $error_status,
     int $size = 0,
     string $dest_filename = 'test.txt',
-    string $source_filename = 'graphql_upload_test.txt'
+    string $source_filename = 'graphql_upload_test.txt',
   ): UploadedFile {
 
     $source_filepath = $this->getSourceTestFilePath($source_filename);

diff --git a/tests/src/Traits/HttpRequestTrait.php b/tests/src/Traits/HttpRequestTrait.php
@@ -46,7 +46,7 @@ protected function query(
     array $extensions = [],
     bool $persisted = FALSE,
     string $method = Request::METHOD_GET,
-    string $operationName = ''
+    string $operationName = '',
   ) {
     $server = $server ?: $this->server;
     $endpoint = $this->server->get('endpoint');