fix(AlterableComposableSchema): Use getCacheId() in getSchemaDocument() as in the parent class (#3477239 by almunnings)

Al Munnings · Klaus Purer · commit b920fdd2d188 · 2025-08-24T09:14:14.000Z
diff --git a/src/GraphQL/Validator.php b/src/GraphQL/Validator.php
@@ -194,10 +194,12 @@ public function getOrphanedResolvers(ServerInterface $server, array $ignore_type
    */
   private function getSchemaPlugin(ServerInterface $server) : SchemaPluginInterface {
     $schema_name = $server->get('schema');
+    $plugin_config = ['server_id' => $server->id()];
     /** @var \Drupal\graphql\Plugin\SchemaPluginInterface $plugin */
     $plugin = $this->pluginManager->createInstance($schema_name);
     if ($plugin instanceof ConfigurableInterface && $config = $server->get('schema_configuration')) {
-      $plugin->setConfiguration($config[$schema_name] ?? []);
+      $schema_config = $config[$schema_name] ?? [];
+      $plugin->setConfiguration($schema_config + $plugin_config);
     }
 
     return $plugin;
diff --git a/src/Plugin/GraphQL/Schema/AlterableComposableSchema.php b/src/Plugin/GraphQL/Schema/AlterableComposableSchema.php
@@ -113,7 +113,7 @@ public function __construct(
    */
   protected function getSchemaDocument(array $extensions = []) {
     // Only use caching of the parsed document if we aren't in development mode.
-    $cid = "schema:{$this->getPluginId()}";
+    $cid = $this->getCacheId('schema');
     if (empty($this->inDevelopment) && $cache = $this->astCache->get($cid)) {
       return $cache->data;
     }

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function __construct(`
`113`	`113`	`*/`
`114`	`114`	`protected function getSchemaDocument(array $extensions = []) {`
`115`	`115`	`// Only use caching of the parsed document if we aren't in development mode.`
`116`		`- $cid = "schema:{$this->getPluginId()}";`
	`116`	`+ $cid = $this->getCacheId('schema');`
`117`	`117`	`if (empty($this->inDevelopment) && $cache = $this->astCache->get($cid)) {`
`118`	`118`	`return $cache->data;`
`119`	`119`	`}`