Hotfixing request stack mis-handling (https://www.drupal.org/node/261…

modules/graphql_block/src/Plugin/GraphQL/Fields/BlocksByRegion.php

@@ -4,7 +4,6 @@
 
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Routing\ResettableStackedRouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\graphql_block\BlockResponse;
 use Drupal\graphql_core\GraphQL\FieldPluginBase;
@@ -68,6 +67,14 @@ public function resolveValues($value, array $args, ResolveInfo $info) {
       }
 
       $response = $this->httpKernel->handle($request, HttpKernelInterface::SUB_REQUEST);
+
+      // TODO:
+      // Remove the request stack manipulation once the core issue described at
+      // https://www.drupal.org/node/2613044 is resolved.
+      while ($this->requestStack->getCurrentRequest() === $request) {
+        $this->requestStack->pop();
+      }
+
       if ($response instanceof BlockResponse) {
         foreach ($response->getBlocks() as $block) {
           yield $block;

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

@@ -128,6 +128,14 @@ public function resolveValues($value, array $args, ResolveInfo $info) {
       $this->languageManager->reset();
 
       $response = $this->httpKernel->handle($request, HttpKernelInterface::SUB_REQUEST);
+
+      // TODO:
+      // Remove the request stack manipulation once the core issue described at
+      // https://www.drupal.org/node/2613044 is resolved.
+      while ($this->requestStack->getCurrentRequest() === $request) {
+        $this->requestStack->pop();
+      }
+
       if ($response instanceof ContextResponse) {
         yield $response->getContext()->getContextValue();
       }

src/Cache/Context/QueryCacheContext.php

@@ -4,6 +4,7 @@
 
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\CacheContextInterface;
+use Drupal\Core\Routing\StackedRouteMatchInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Youshido\GraphQL\Parser\Parser;
 

src/Cache/ResponsePolicy/DenyMutation.php

@@ -3,7 +3,7 @@
 namespace Drupal\graphql\Cache\ResponsePolicy;
 
 use Drupal\Core\PageCache\ResponsePolicyInterface;
-use Drupal\Core\Routing\ResettableStackedRouteMatchInterface;
+use Drupal\Core\Routing\StackedRouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Youshido\GraphQL\Execution\Context\ExecutionContext;
@@ -16,25 +16,25 @@ class DenyMutation implements ResponsePolicyInterface  {
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\ResettableStackedRouteMatchInterface
+   * @var \Drupal\Core\Routing\StackedRouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Constructs a new request policy instance.
    *
-   * @param \Drupal\Core\Routing\ResettableStackedRouteMatchInterface $routeMatch
+   * @param \Drupal\Core\Routing\StackedRouteMatchInterface $routeMatch
    *   The route provider service.
    */
-  public function __construct(ResettableStackedRouteMatchInterface $routeMatch) {
+  public function __construct(StackedRouteMatchInterface $routeMatch) {
     $this->routeMatch = $routeMatch;
   }
 
   /**
    * {@inheritdoc}
    */
   public function check(Response $response, Request $request) {
-    if ($this->routeMatch->getCurrentRouteMatch()->getRouteName() !== 'graphql.request') {
+    if ($this->routeMatch->getRouteMatchFromRequest($request) !== 'graphql.request') {
       return NULL;
     }
 

src/Cache/ResponsePolicy/DenyPageCache.php

@@ -3,7 +3,7 @@
 namespace Drupal\graphql\Cache\ResponsePolicy;
 
 use Drupal\Core\PageCache\ResponsePolicyInterface;
-use Drupal\Core\Routing\ResettableStackedRouteMatchInterface;
+use Drupal\Core\Routing\StackedRouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -15,25 +15,25 @@ class DenyPageCache implements ResponsePolicyInterface  {
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\ResettableStackedRouteMatchInterface
+   * @var \Drupal\Core\Routing\StackedRouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Constructs a new request policy instance.
    *
-   * @param \Drupal\Core\Routing\ResettableStackedRouteMatchInterface $routeMatch
+   * @param \Drupal\Core\Routing\StackedRouteMatchInterface $routeMatch
    *   The route provider service.
    */
-  public function __construct(ResettableStackedRouteMatchInterface $routeMatch) {
+  public function __construct(StackedRouteMatchInterface $routeMatch) {
     $this->routeMatch = $routeMatch;
   }
 
   /**
    * {@inheritdoc}
    */
   public function check(Response $response, Request $request) {
-    if ($this->routeMatch->getCurrentRouteMatch()->getRouteName() !== 'graphql.request') {
+    if ($this->routeMatch->getRouteMatchFromRequest($request) !== 'graphql.request') {
       return static::DENY;
     }
 

src/Controller/RequestController.php

@@ -15,6 +15,7 @@
 use Drupal\graphql\Reducers\ReducerManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Youshido\GraphQL\Schema\AbstractSchema;
@@ -66,6 +67,13 @@ class RequestController implements ContainerInjectionInterface {
    */
   protected $reducerManager;
 
+  /**
+   * The request stack service.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
   /**
    * Constructs a RequestController object.
    *
@@ -79,15 +87,26 @@ class RequestController implements ContainerInjectionInterface {
    *   The config service.
    * @param \Symfony\Component\HttpKernel\HttpKernelInterface $httpKernel
    *   The http kernel service.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack
+   *   The request stack service.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer service.
    */
-  public function __construct(ContainerInterface $container, AbstractSchema $schema, ReducerManager $reducerManager, Config $config, HttpKernelInterface $httpKernel, RendererInterface $renderer) {
+  public function __construct(
+    ContainerInterface $container,
+    AbstractSchema $schema,
+    ReducerManager $reducerManager,
+    Config $config,
+    HttpKernelInterface $httpKernel,
+    RequestStack $requestStack,
+    RendererInterface $renderer
+  ) {
     $this->container = $container;
     $this->schema = $schema;
     $this->reducerManager = $reducerManager;
     $this->config = $config;
     $this->httpKernel = $httpKernel;
+    $this->requestStack = $requestStack;
     $this->renderer = $renderer;
   }
 
@@ -101,6 +120,7 @@ public static function create(ContainerInterface $container) {
       $container->get('graphql.reducer_manager'),
       $container->get('config.factory')->get('system.performance'),
       $container->get('http_kernel'),
+      $container->get('request_stack'),
       $container->get('renderer')
     );
   }
@@ -145,7 +165,16 @@ public function handleBatchRequest(Request $request, array $queries = []) {
         $subRequest->setSession($session);
       }
 
-      return $this->httpKernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
+      $output = $this->httpKernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
+
+      // TODO:
+      // Remove the request stack manipulation once the core issue described at
+      // https://www.drupal.org/node/2613044 is resolved.
+      while ($this->requestStack->getCurrentRequest() === $subRequest) {
+        $this->requestStack->pop();
+      }
+
+      return $output;
     }, $queries);
 
     // Gather all responses from all sub-requests.

src/EventSubscriber/CacheSubscriber.php

@@ -10,7 +10,7 @@
 use Drupal\Core\Cache\Context\CacheContextsManager;
 use Drupal\Core\PageCache\RequestPolicyInterface;
 use Drupal\Core\PageCache\ResponsePolicyInterface;
-use Drupal\Core\Routing\ResettableStackedRouteMatchInterface;
+use Drupal\Core\Routing\StackedRouteMatchInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
@@ -98,7 +98,7 @@ class CacheSubscriber implements EventSubscriberInterface {
    *   A policy rule determining the cacheability of a request.
    * @param \Drupal\Core\PageCache\ResponsePolicyInterface $responsePolicy
    *   A policy rule determining the cacheability of the response.
-   * @param \Drupal\Core\Routing\ResettableStackedRouteMatchInterface $routeMatch
+   * @param \Drupal\Core\Routing\StackedRouteMatchInterface $routeMatch
    *   The current route match.
    * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack
    *   The request stack.
@@ -112,7 +112,7 @@ class CacheSubscriber implements EventSubscriberInterface {
   public function __construct(
     RequestPolicyInterface $requestPolicy,
     ResponsePolicyInterface $responsePolicy,
-    ResettableStackedRouteMatchInterface $routeMatch,
+    StackedRouteMatchInterface $routeMatch,
     RequestStack $requestStack,
     CacheBackendInterface $responseCache,
     CacheBackendInterface $metadataCache,
@@ -136,12 +136,14 @@ public function __construct(
    *   The event to process.
    */
   public function onRouteMatch(GetResponseEvent $event) {
-    if ($this->routeMatch->getCurrentRouteMatch()->getRouteName() !== 'graphql.request') {
+    $request = $event->getRequest();
+    $routeMatch = $this->routeMatch->getRouteMatchFromRequest($request);
+
+    if ($routeMatch->getRouteName() !== 'graphql.request') {
       return;
     }
 
     // We do not need to cache batch requests locally.
-    $request = $event->getRequest();
     if (empty($request->attributes->get('query'))) {
       return;
     }
@@ -173,7 +175,10 @@ public function onRouteMatch(GetResponseEvent $event) {
    *   The event to process.;
    */
   public function onResponse(FilterResponseEvent $event) {
-    if ($this->routeMatch->getCurrentRouteMatch()->getRouteName() !== 'graphql.request') {
+    $request = $event->getRequest();
+    $routeMatch = $this->routeMatch->getRouteMatchFromRequest($request);
+
+    if ($routeMatch->getRouteName() !== 'graphql.request') {
       return;
     }
 
@@ -188,7 +193,6 @@ public function onResponse(FilterResponseEvent $event) {
     }
 
     // We do not need to cache batch requests locally.
-    $request = $event->getRequest();
     if (empty($request->attributes->get('query'))) {
       return;
     }