Attempt to fix the tests and adding both version for webonyx/graphql-…

…php.
drupal-graphql · Jul 18, 2024 · 9371834 · 9371834
1 parent 627ce0f
commit 9371834
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
   "require": {
     "drupal/typed_data": "^1.0 || ^2.0",
     "php": ">=8.0",
-    "webonyx/graphql-php": "^15.12.0"
+    "webonyx/graphql-php": "^14.8.0 || ^15.12.0"
   },
   "minimum-stability": "dev"
 }
diff --git a/src/Entity/Server.php b/src/Entity/Server.php
@@ -247,7 +247,12 @@ public function configuration() {
     $server->setDebugFlag($this->get('debug_flag'));
     $server->setQueryBatching(!!$this->get('batching'));
     $server->setValidationRules($this->getValidationRules());
-    $server->setPersistentQueryLoader($this->getPersistedQueryLoader());
+    if (method_exists(ServerConfig::class, 'setPersistedQueryLoader')) {
+      $server->setPersistedQueryLoader($this->getPersistedQueryLoader());
+    }
+    else {
+      $server->setPersistentQueryLoader($this->getPersistedQueryLoader());
+    }
     $server->setContext($this->getContext($plugin, $params));
     $server->setFieldResolver($this->getFieldResolver($registry));
     $server->setSchema($plugin->getSchema($registry));

diff --git a/tests/src/Kernel/DataProducer/DefaultValueTest.php b/tests/src/Kernel/DataProducer/DefaultValueTest.php
@@ -54,7 +54,7 @@ public function testLegacyDefaultValueSetting(bool $populate_setting, string $te
   /**
    * Data provider for the testLegacyDefaultValueSetting test.
    */
-  public function settingsProvider(): array {
+  public static function settingsProvider(): array {
     return [
       [FALSE, TestLegacyEntityLoad::class],
       [TRUE, TestNewEntityLoad::class],