Skip validation for cached results and persisted queries. (#715) (#722)

Author: LennardWesterveld

src/GraphQL/Execution/QueryProcessor.php

@@ -183,7 +183,8 @@ protected function executeOperation(PromiseAdapter $adapter, ServerConfig $confi
         return $adapter->createFulfilled(new QueryResult(NULL, $errors));
       }
 
-      $document = $params->queryId ? $this->loadPersistedQuery($config, $params) : $params->query;
+      $persisted = isset($params->queryId);
+      $document = $persisted ? $this->loadPersistedQuery($config, $params) : $params->query;
       if (!$document instanceof DocumentNode) {
         $document = Parser::parse($document);
       }
@@ -199,10 +200,10 @@ protected function executeOperation(PromiseAdapter $adapter, ServerConfig $confi
 
       // Only queries can be cached (mutations and subscriptions can't).
       if ($type === 'query') {
-        return $this->executeCacheableOperation($adapter, $config, $params, $document);
+        return $this->executeCacheableOperation($adapter, $config, $params, $document, !$persisted);
       }
 
-      return $this->executeUncachableOperation($adapter, $config, $params, $document);
+      return $this->executeUncachableOperation($adapter, $config, $params, $document, !$persisted);
     }
     catch (CacheableRequestError $exception) {
       return $adapter->createFulfilled(
@@ -222,10 +223,11 @@ protected function executeOperation(PromiseAdapter $adapter, ServerConfig $confi
    * @param \GraphQL\Server\ServerConfig $config
    * @param \GraphQL\Server\OperationParams $params
    * @param \GraphQL\Language\AST\DocumentNode $document
+   * @param bool $validate
    *
    * @return \GraphQL\Executor\Promise\Promise|mixed
    */
-  protected function executeCacheableOperation(PromiseAdapter $adapter, ServerConfig $config, OperationParams $params, DocumentNode $document) {
+  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)) {
       $contexts = $contextCache->data ?: [];
@@ -235,7 +237,7 @@ protected function executeCacheableOperation(PromiseAdapter $adapter, ServerConf
       }
     }
 
-    $result = $this->doExecuteOperation($adapter, $config, $params, $document);
+    $result = $this->doExecuteOperation($adapter, $config, $params, $document, $validate);
     return $result->then(function (QueryResult $result) use ($contextCacheId, $params, $document) {
       // Write this query into the cache if it is cacheable.
       if ($result->getCacheMaxAge() !== 0) {
@@ -256,11 +258,12 @@ protected function executeCacheableOperation(PromiseAdapter $adapter, ServerConf
    * @param \GraphQL\Server\ServerConfig $config
    * @param \GraphQL\Server\OperationParams $params
    * @param \GraphQL\Language\AST\DocumentNode $document
+   * @param bool $validate
    *
    * @return \GraphQL\Executor\Promise\Promise
    */
-  protected function executeUncachableOperation(PromiseAdapter $adapter, ServerConfig $config, OperationParams $params, DocumentNode $document) {
-    $result = $this->doExecuteOperation($adapter, $config, $params, $document);
+  protected function executeUncachableOperation(PromiseAdapter $adapter, ServerConfig $config, OperationParams $params, DocumentNode $document, $validate = TRUE) {
+    $result = $this->doExecuteOperation($adapter, $config, $params, $document, $validate);
     return $result->then(function (QueryResult $result) {
       // Mark the query result as uncacheable.
       $result->mergeCacheMaxAge(0);
@@ -273,13 +276,14 @@ protected function executeUncachableOperation(PromiseAdapter $adapter, ServerCon
    * @param \GraphQL\Server\ServerConfig $config
    * @param \GraphQL\Server\OperationParams $params
    * @param \GraphQL\Language\AST\DocumentNode $document
+   * @param bool $validate
    *
    * @return \GraphQL\Executor\Promise\Promise
    */
-  protected function doExecuteOperation(PromiseAdapter $adapter, ServerConfig $config, OperationParams $params, DocumentNode $document) {
+  protected function doExecuteOperation(PromiseAdapter $adapter, ServerConfig $config, OperationParams $params, DocumentNode $document, $validate = TRUE) {
     // If one of the validation rules found any problems, do not resolve the
     // query and bail out early instead.
-    if ($errors = $this->validateOperation($config, $params, $document)) {
+    if ($validate && $errors = $this->validateOperation($config, $params, $document)) {
       return $adapter->createFulfilled(new QueryResult(NULL, $errors));
     }