Drupal 10 compatility fix bugs

Author: Luis

modules/graphql_core/src/Plugin/GraphQL/Fields/EntityFieldBase.php

@@ -4,10 +4,7 @@
 
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\Cache\CacheableDependencyInterface;
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\Entity;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Field\FieldItemInterface;
 use Drupal\graphql\GraphQL\Execution\ResolveContext;
 use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;

modules/graphql_core/tests/src/Kernel/Blocks/BlockTest.php

@@ -6,7 +6,6 @@
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Tests\block\Traits\BlockCreationTrait;
 use Drupal\Tests\graphql_core\Kernel\GraphQLCoreTestBase;
-use Symfony\Component\HttpFoundation\Session\Session;
 
 /**
  * Test block retrieval via GraphQL.
@@ -37,11 +36,6 @@ class BlockTest extends GraphQLCoreTestBase {
   protected function setUp(): void {
     parent::setUp();
 
-    $request = $this->container->get('request_stack')->getCurrentRequest();
-
-    $session = new Session();
-    $request->setSession($session);
-
     /** @var \Drupal\Core\Extension\ThemeInstallerInterface $themeInstaller */
     $themeInstaller = $this->container->get('theme_installer');
     $themeInstaller->install(['stark']);
@@ -85,7 +79,7 @@ public function testStaticBlocks() {
       'block_content:1',
       // @todo Check metatags. Is the config metatag required?
       'config:block.block.stark_powered',
-    ])->setCacheMaxAge(0);
+    ]);
 
     $this->assertResults($query, [], [
       'route' => [

modules/graphql_core/tests/src/Kernel/GraphQLCoreTestBase.php

@@ -3,6 +3,7 @@
 namespace Drupal\Tests\graphql_core\Kernel;
 
 use Drupal\Tests\graphql\Kernel\GraphQLTestBase;
+use Symfony\Component\HttpFoundation\Session\Session;
 
 /**
  * Test base for drupal core graphql functionality.
@@ -27,6 +28,11 @@ protected function setUp(): void {
     $this->container->get('module_handler')->loadInclude('user', 'install');
     $this->installEntitySchema('user');
     user_install();
+
+    // Init session.
+    $request = $this->container->get('request_stack')->getCurrentRequest();
+    $session = new Session();
+    $request->setSession($session);
   }
 
 }

src/GraphQL/Execution/QueryProcessor.php

@@ -29,6 +29,9 @@
 use GraphQL\Validator\ValidationContext;
 use Symfony\Component\HttpFoundation\RequestStack;
 
+/**
+ * Query processor class.
+ */
 class QueryProcessor {
 
   /**
@@ -199,7 +202,7 @@ protected function executeOperation(PromiseAdapter $adapter, ServerConfig $confi
       }
 
       // Only queries can be cached (mutations and subscriptions can't).
-      if ($type === 'query') {
+      if ($type->operation === 'query') {
         return $this->executeCacheableOperation($adapter, $config, $params, $document, !$persisted);
       }
 
@@ -229,7 +232,7 @@ protected function executeOperation(PromiseAdapter $adapter, ServerConfig $confi
    */
   protected function executeCacheableOperation(PromiseAdapter $adapter, ServerConfig $config, OperationParams $params, DocumentNode $document, $validate = TRUE) {
     $contextCacheId = 'ccid:' . $this->cacheIdentifier($params, $document);
-    if (!$config->getDebug() && $contextCache = $this->cacheBackend->get($contextCacheId)) {
+    if (!$config->getDebugFlag() && $contextCache = $this->cacheBackend->get($contextCacheId)) {
       $contexts = $contextCache->data ?: [];
       $cid = 'cid:' . $this->cacheIdentifier($params, $document, $contexts);
       if ($cache = $this->cacheBackend->get($cid)) {