Merge remote-tracking branch 'origin/master' into dependabot-composer-doctrine-coding-standard-tw-13.0or-tw-14.0

Author: Copilot

.github/workflows/continuous_integration.yml

@@ -83,7 +83,7 @@ jobs:
           path: "build"
           overwrite: true
 
-      - uses: codecov/codecov-action@v6.0.0 # upload the coverage to codecov
+      - uses: codecov/codecov-action@v7.0.0 # upload the coverage to codecov
         with:
           fail_ci_if_error: false # optional (default = false) - Need CODECOV_TOKEN
         # Do not upload in forks, and only on php8.4, latest deps

composer.json

@@ -10,9 +10,9 @@
         }
     ],
     "require": {
+        "composer-runtime-api": "^2.0",
         "php": ">=8.2",
         "ext-json": "*",
-        "composer/package-versions-deprecated": "^1.8",
         "phpdocumentor/reflection-docblock": "^5.4",
         "phpdocumentor/type-resolver": "^1.7",
         "psr/container": "^1.1 || ^2",
@@ -64,7 +64,6 @@
     },
     "config": {
         "allow-plugins": {
-            "composer/package-versions-deprecated": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "phpstan/extension-installer": true
         },

examples/no-framework/composer.json

@@ -7,8 +7,8 @@
   "require": {
     "thecodingmachine/graphqlite": "@dev",
     "mouf/picotainer": "^1.1",
-    "symfony/cache": "^4.3",
-    "psr/simple-cache": "^1.0"
+    "symfony/cache": "^7.4",
+    "psr/simple-cache": "^3.0"
   },
   "repositories": [
     {

src/Http/Psr15GraphQLMiddlewareBuilder.php

@@ -6,6 +6,8 @@
 
 use DateInterval;
 use GraphQL\Error\DebugFlag;
+use GraphQL\Language\AST\DocumentNode;
+use GraphQL\Server\OperationParams;
 use GraphQL\Server\ServerConfig;
 use GraphQL\Type\Schema;
 use GraphQL\Validator\DocumentValidator;
@@ -133,13 +135,17 @@ public function createMiddleware(): MiddlewareInterface
         // So if we only added given rule, all of the default rules would not be validated, so we must also provide them.
         $originalValidationRules = $this->config->getValidationRules() ?? DocumentValidator::allRules();
 
-        $this->config->setValidationRules(function (...$args) use ($originalValidationRules) {
-            if (is_callable($originalValidationRules)) {
-                $originalValidationRules = $originalValidationRules(...$args);
-            }
+        $this->config->setValidationRules(function (
+            OperationParams $operation,
+            DocumentNode $doc,
+            string $operationType,
+        ) use ($originalValidationRules): array {
+            $validationRules = is_callable($originalValidationRules)
+                ? $originalValidationRules($operation, $doc, $operationType)
+                : $originalValidationRules;
 
             return [
-                ...$originalValidationRules,
+                ...$validationRules,
                 ...$this->addedValidationRules,
             ];
         });

src/SchemaFactory.php

@@ -4,12 +4,12 @@
 
 namespace TheCodingMachine\GraphQLite;
 
+use Composer\InstalledVersions;
 use GraphQL\Type\SchemaConfig;
 use Kcs\ClassFinder\FileFinder\CachedFileFinder;
 use Kcs\ClassFinder\FileFinder\DefaultFileFinder;
 use Kcs\ClassFinder\Finder\ComposerFinder;
 use Kcs\ClassFinder\Finder\FinderInterface;
-use PackageVersions\Versions;
 use Psr\Container\ContainerInterface;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -141,7 +141,7 @@ public function __construct(
         private readonly ContainerInterface $container,
         private ClassBoundCache|null $classBoundCache = null,
     ) {
-        $this->cacheNamespace = substr(md5(Versions::getVersion('thecodingmachine/graphqlite')), 0, 8);
+        $this->cacheNamespace = substr(md5(InstalledVersions::getVersion('thecodingmachine/graphqlite') ?? ''), 0, 8);
     }
 
     /**

src/Utils/NamespacedCache.php

@@ -4,8 +4,8 @@
 
 namespace TheCodingMachine\GraphQLite\Utils;
 
+use Composer\InstalledVersions;
 use DateInterval;
-use PackageVersions\Versions;
 use Psr\SimpleCache\CacheInterface;
 use Psr\SimpleCache\InvalidArgumentException;
 use function md5;
@@ -22,7 +22,7 @@ class NamespacedCache implements CacheInterface
 
     public function __construct(private readonly CacheInterface $cache)
     {
-        $this->namespace = substr(md5(Versions::getVersion('thecodingmachine/graphqlite')), 0, 8);
+        $this->namespace = substr(md5(InstalledVersions::getVersion('thecodingmachine/graphqlite') ?? ''), 0, 8);
     }
 
     /**