use custom interface

Author: shmax

composer.json

@@ -11,8 +11,7 @@
   "require": {
     "php": "^7.4 || ^8",
     "ext-json": "*",
-    "ext-mbstring": "*",
-    "psr/simple-cache": "^1.0"
+    "ext-mbstring": "*"
   },
   "require-dev": {
     "amphp/amp": "^2.6",
@@ -29,6 +28,7 @@
     "phpstan/phpstan-strict-rules": "2.0.4",
     "phpunit/phpunit": "^9.5 || ^10.5.21 || ^11",
     "psr/http-message": "^1 || ^2",
+    "psr/simple-cache": "^1.0",
     "react/http": "^1.6",
     "react/promise": "^2.0 || ^3.0",
     "rector/rector": "^2.0",

src/GraphQL.php

@@ -19,7 +19,7 @@
 use GraphQL\Validator\DocumentValidator;
 use GraphQL\Validator\Rules\QueryComplexity;
 use GraphQL\Validator\Rules\ValidationRule;
-use Psr\SimpleCache\CacheInterface;
+use GraphQL\Validator\ValidationCache;
 
 /**
  * This is the primary facade for fulfilling GraphQL operations.
@@ -92,7 +92,7 @@ public static function executeQuery(
         ?string $operationName = null,
         ?callable $fieldResolver = null,
         ?array $validationRules = null,
-        ?CacheInterface $cache = null,
+        ?ValidationCache $cache = null,
     ): ExecutionResult {
         $promiseAdapter = new SyncPromiseAdapter();
 
@@ -136,7 +136,7 @@ public static function promiseToExecute(
         ?string $operationName = null,
         ?callable $fieldResolver = null,
         ?array $validationRules = null,
-        ?CacheInterface $cache = null
+        ?ValidationCache $cache = null
     ): Promise {
         try {
             $documentNode = $source instanceof DocumentNode

src/Validator/DocumentValidator.php

@@ -49,8 +49,6 @@
 use GraphQL\Validator\Rules\ValuesOfCorrectType;
 use GraphQL\Validator\Rules\VariablesAreInputTypes;
 use GraphQL\Validator\Rules\VariablesInAllowedPosition;
-use Psr\SimpleCache\CacheInterface;
-use Psr\SimpleCache\InvalidArgumentException;
 
 /**
  * Implements the "Validation" section of the spec.
@@ -102,18 +100,13 @@ public static function validate(
         DocumentNode $ast,
         ?array $rules = null,
         ?TypeInfo $typeInfo = null,
-        ?CacheInterface $cache = null
+        ?ValidationCache $cache = null
     ): array {
-        $cacheKey = null;
-
         if (isset($cache)) {
-            $cacheKey = 'gql_validation_' . md5($ast->__toString());
-
-            try {
-                if ($cache->has($cacheKey)) {
-                    return $cache->get($cacheKey);
-                }
-            } catch (InvalidArgumentException $e) {}
+            $cached = $cache->isValidated($schema, $ast);
+            if ($cached) {
+                return [];
+            }
         }
 
         $rules ??= static::allRules();
@@ -140,11 +133,9 @@ public static function validate(
         $errors = $context->getErrors();
 
         // Only cache clean results
-        try {
-            if (isset($cacheKey) && count($errors) === 0) {
-                $cache->set($cacheKey, $errors);
-            }
-        } catch (InvalidArgumentException $e) {}
+        if (isset($cache) && count($errors) === 0) {
+            $cache->markValidated($schema, $ast);
+        }
 
         return $errors;
     }

src/Validator/ValidationCache.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace GraphQL\Validator;
+
+use GraphQL\GraphQL;
+use GraphQL\Language\AST\DocumentNode;
+use GraphQL\Type\Schema;
+
+/**
+ * Implement this interface and pass an instance to GraphQL::executeQuery to cache validation of ASTs. The details
+ * of how to compute any keys (or whether to validate at all) are left up to you.
+ */
+interface ValidationCache
+{
+    /**
+     * Return true if the given schema + AST pair has previously been validated successfully.
+     * Only successful validations are cached. A return value of false means the pair is either unknown or has not been validated yet.
+     */
+    public function isValidated(Schema $schema, DocumentNode $ast): bool;
+
+    /**
+     * Cache validation status for this schema/query.
+     */
+    public function markValidated(Schema $schema, DocumentNode $ast): void;
+}