Fix merge 8.x.4.x

Author: jcapote1x

.github/workflows/testing.yml

@@ -85,6 +85,7 @@ jobs:
         run: composer --no-interaction --no-progress require \
           webonyx/graphql-php:^14.8 \
           drupal/typed_data:^1.0 \
+          drupal/redirect:^1.0 \
           phpstan/phpstan:^1.7.14 \
           mglaman/phpstan-drupal:^1.1.2 \
           phpstan/phpstan-deprecation-rules:^1.0.0 \

assets/explorer/dist/bundle.min.js

@@ -10,7 +10,7 @@ import Explorer from './Explorer';
  */
 Drupal.behaviors.graphQLRenderExplorer = {
   attach: (context, settings) => {
-    const container = jQuery('#graphql-explorer', context).once('graphql-explorer')[0] || undefined;
+    const container = jQuery(once('graphql-explorer', '#graphql-explorer', context))[0] || undefined;
 
     if (typeof container === 'undefined') {
       return;

assets/explorer/src/index.js

@@ -6,6 +6,7 @@
     "lint": "eslint src"
   },
   "dependencies": {
+    "@drupal/once": "^1.0.1",
     "graphql": "^15.5.1",
     "graphql-voyager": "^1.0.0-rc.27",
     "react": "^16.3",

assets/voyager/dist/bundle.min.js

@@ -3,13 +3,14 @@ import ReactDOM from 'react-dom';
 import { Voyager } from 'graphql-voyager';
 import Drupal from 'drupal';
 import jQuery from 'jquery';
+import once from '@drupal/once';
 
 /**
  * Behavior for rendering the GraphQL Voyager interface.
  */
 Drupal.behaviors.graphQLRenderVoyager = {
   attach: (context, settings) => {
-    const container = jQuery('#graphql-voyager', context).once('graphql-voyager')[0] || undefined;
+    const container = jQuery(once('graphql-voyager', '#graphql-voyager', context))[0] || undefined;
 
     if (typeof container === 'undefined') {
       return;

assets/voyager/package.json

@@ -99,6 +99,11 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f"
   integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==
 
+"@drupal/once@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@drupal/once/-/once-1.0.1.tgz#7c1ef480aec6d5fa4b5ae986afa5a607afc38482"
+  integrity sha512-O8tQmNDBgSm3ADuFZ5OZlGxsrdsc+pEqd1NBoMpSzWwiOnWwC91tqDwnlX+mDh7sBJoJ+4vVwFh0NLUV4LPFvg==
+
 "@eslint/eslintrc@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.1.0.tgz#583d12dbec5d4f22f333f9669f7d0b7c7815b4d3"

assets/voyager/src/index.js

@@ -6,9 +6,9 @@ Custom data producers allow you essentially hook into any data of Drupal, becaus
 
 Lets look at a custom Data producer that loads the current user (similar to the 3.x version of currentUser query).
 
-The first step as seen before  is to add our query to the schema : 
+The first step as seen before  is to add our query to the schema :
 
-``` 
+```
 type Query {
   ...
   currentUser: User
@@ -21,7 +21,7 @@ type User {
 }
 ```
 
-Now that we have this we need to make a resolver that actually loads this user, but for that first we need our own custom data producer "CurrentUser" : 
+Now that we have this we need to make a resolver that actually loads this user, but for that first we need our own custom data producer "CurrentUser" :
 
 ```php
 <?php
@@ -99,7 +99,7 @@ class CurrentUser extends DataProducerPluginBase implements ContainerFactoryPlug
 
 We are defining a custom data producer `current_user` that we can now use to resolve our query that we previously added to the schema.  Notice that our data producer returns only the user id and not the actual user object. However we can combine it with an entity_load which is already made very efficient with in the module (taking advantage of caching strategies using buffering) so we don't have to actually load the user here.
 
-Lets see how we can consume our newly created data producer : 
+Lets see how we can consume our newly created data producer :
 
 ```php
 $registry->addFieldResolver('Query', 'currentUser', $builder->compose(
@@ -112,7 +112,7 @@ $registry->addFieldResolver('Query', 'currentUser', $builder->compose(
 
 Notice how we combine our custom data producer with a built-in `entity_load` to make querying more performance and standardized across. We will look at `compose` in more detail in the next section.
 
-In the end when we do a query like this : 
+In the end when we do a query like this :
 
 ```graphql
 {
@@ -123,7 +123,7 @@ In the end when we do a query like this :
 }
 ```
 
-we get a result like this : 
+we get a result like this :
 
 ```json
 {
@@ -136,4 +136,15 @@ we get a result like this :
 }
 ```
 
-(For this to actually work we would need to add resolvers to the User object to resolve the `id` and `name` properties).
+For this to actually work we would need to add resolvers to the User object to resolve the `id` and `name` properties like so:
+```php
+$registry->addFieldResolver('User', 'id', $builder->callback(function ($account) {
+  /** @var \Drupal\Core\Session\AccountProxyInterface $account */
+  return $account->id();
+}));
+
+$registry->addFieldResolver('User', 'name', $builder->callback(function ($account) {
+  /** @var \Drupal\Core\Session\AccountProxyInterface $account */
+  return $account->getAccountName();
+}));
+```

assets/voyager/yarn.lock

@@ -9,7 +9,7 @@ explorer:
   dependencies:
     - core/drupal
     - core/jquery
-    - core/jquery.once
+    - core/once
 
 voyager:
   version: VERSION
@@ -23,7 +23,7 @@ voyager:
   dependencies:
     - core/drupal
     - core/jquery
-    - core/jquery.once
+    - core/once
 
 persisted_queries:
   version: VERSION
@@ -32,4 +32,4 @@ persisted_queries:
   dependencies:
     - core/drupal
     - core/jquery
-    - core/jquery.once
+    - core/once

doc/producers/custom.md

@@ -48,8 +48,8 @@ graphql.explorer:
   options:
     _admin_route: TRUE
     parameters:
-      server:
-        type: entity:graphql_server
+      graphql_server:
+        with_config_overrides: TRUE
 
 graphql.voyager:
   path: '/admin/config/graphql/servers/manage/{graphql_server}/voyager'
@@ -62,7 +62,7 @@ graphql.voyager:
     _admin_route: TRUE
     parameters:
       graphql_server:
-        type: entity:graphql_server
+        with_config_overrides: TRUE
 
 graphql.validate:
   path: '/admin/config/graphql/servers/manage/{graphql_server}/validate'
@@ -75,8 +75,7 @@ graphql.validate:
     _admin_route: TRUE
     parameters:
       graphql_server:
-        type: entity:graphql_server
-
+        with_config_overrides: TRUE
 
 entity.graphql_server.delete_form:
   path: '/admin/config/graphql/servers/manage/{graphql_server}/delete'

graphql.libraries.yml

@@ -39,6 +39,14 @@ services:
     tags:
       - { name: cache.context }
 
+  # Cache bin for the persisted queries.
+  cache.graphql.apq:
+    class: Drupal\Core\Cache\CacheBackendInterface
+    tags:
+      - { name: cache.bin }
+    factory: cache_factory:get
+    arguments: [graphql_apq]
+
   # Cache bin for the parsed sdl ast.
   cache.graphql.ast:
     class: Drupal\Core\Cache\CacheBackendInterface
@@ -116,6 +124,13 @@ services:
     tags:
       - { name: event_subscriber }
 
+  # Cache the queries to be persistent.
+  graphql.apq_subscriber:
+    class: Drupal\graphql\EventSubscriber\ApqSubscriber
+    arguments: ['@cache.graphql.apq']
+    tags:
+      - { name: event_subscriber }
+
   # Plugin manager for schemas
   plugin.manager.graphql.schema:
     class: Drupal\graphql\Plugin\SchemaPluginManager

graphql.routing.yml

@@ -25,7 +25,6 @@ parameters:
     # that.
     - "#^Access to an undefined property Drupal\\\\#"
     # PHPUnit deprecation warnings in Drupal 9 that we don't care about.
-    - "#^Call to deprecated method setMethods\\(\\) of class PHPUnit\\\\Framework\\\\MockObject\\\\MockBuilder:#"
     - "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
     # Drupal allows object property access to custom fields, so we cannot fix
     # that.

graphql.services.yml

@@ -60,7 +60,7 @@ public function removeAllPersistedQueryInstances();
   /**
    * Returns the current persisted queries set.
    *
-   * @return \Drupal\graphql\Plugin\PersistedQueryPluginInterface[]
+   * @return \Drupal\graphql\Plugin\PersistedQueryPluginInterface[]|null
    */
   public function getPersistedQueryInstances();
 

phpstan.neon

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\graphql\Event;
+
+use Drupal\Component\EventDispatcher\Event;
+
+/**
+ * Represents an event that is triggered to alter schema data.
+ */
+class AlterSchemaDataEvent extends Event {
+
+  /**
+   * Event fired to alter schema data.
+   *
+   * @var string
+   */
+  const EVENT_NAME = 'graphql.sdl.alter_schema';
+
+  /**
+   * The schema array data.
+   *
+   * @var array
+   */
+  protected $schemaData;
+
+  /**
+   * AlterSchemaDataEvent constructor.
+   *
+   * @param array $schemaData
+   *   The schema data reference.
+   */
+  public function __construct(array &$schemaData) {
+    $this->schemaData = $schemaData;
+  }
+
+  /**
+   * Returns the schema data.
+   *
+   * @return array
+   *   The schema data.
+   */
+  public function getSchemaData(): array {
+    return $this->schemaData;
+  }
+
+  /**
+   * Sets the schema data.
+   *
+   * @param array $schemaData
+   *   The schema data.
+   */
+  public function setSchemaData(array $schemaData): void {
+    $this->schemaData = $schemaData;
+  }
+
+}

src/Entity/ServerInterface.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\graphql\Event;
+
+use Drupal\Component\EventDispatcher\Event;
+
+/**
+ * Represents an event that is triggered to alter schema extension data.
+ */
+class AlterSchemaExtensionDataEvent extends Event {
+
+  /**
+   * Event fired to alter schema extension data.
+   *
+   * @var string
+   */
+  const EVENT_NAME = 'graphql.sdl.alter_schema_extension';
+
+  /**
+   * The schema array data.
+   *
+   * @var array
+   */
+  protected $schemaExtensionData;
+
+  /**
+   * AlterSchemaExtensionDataEvent constructor.
+   *
+   * @param array $schemaExtensionData
+   *   The schema extension data.
+   */
+  public function __construct(array $schemaExtensionData) {
+    $this->schemaExtensionData = $schemaExtensionData;
+  }
+
+  /**
+   * Returns the schema extension data.
+   *
+   * @return array
+   *   The schema extension data.
+   */
+  public function getSchemaExtensionData(): array {
+    return $this->schemaExtensionData;
+  }
+
+  /**
+   * Returns the schema extension data.
+   *
+   * @param array $schemaExtensionData
+   *   The schema extension data.
+   */
+  public function setSchemaExtensionData(array $schemaExtensionData): void {
+    $this->schemaExtensionData = $schemaExtensionData;
+  }
+
+}