From 4e2a1c37dc98fee9f789677665035219677ce39b Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Thu, 6 Feb 2014 23:38:31 -0800
Subject: [PATCH] Issue #2187097 by dawehner, tim.plunkett: Add a request_stack
service and use it for the http kernel.
---
core/core.services.yml | 4 +++-
core/lib/Drupal/Core/HttpKernel.php | 17 +++++++++++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/core/core.services.yml b/core/core.services.yml
index 6ad63cfcf25b..d10db5be69c8 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -215,6 +215,8 @@ services:
request:
class: Symfony\Component\HttpFoundation\Request
synthetic: true
+ request_stack:
+ class: Symfony\Component\HttpFoundation\RequestStack
event_dispatcher:
class: Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher
arguments: ['@service_container']
@@ -226,7 +228,7 @@ services:
arguments: ['@controller_resolver', '@string_translation']
http_kernel:
class: Drupal\Core\HttpKernel
- arguments: ['@event_dispatcher', '@service_container', '@controller_resolver']
+ arguments: ['@event_dispatcher', '@service_container', '@controller_resolver', '@request_stack']
language_manager:
class: Drupal\Core\Language\LanguageManager
arguments: ['@language.default']
diff --git a/core/lib/Drupal/Core/HttpKernel.php b/core/lib/Drupal/Core/HttpKernel.php
index f0dfde877459..1f75531237a2 100644
--- a/core/lib/Drupal/Core/HttpKernel.php
+++ b/core/lib/Drupal/Core/HttpKernel.php
@@ -14,6 +14,7 @@
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -34,9 +35,21 @@ class HttpKernel extends BaseHttpKernel
private $esiSupport;
- public function __construct(EventDispatcherInterface $dispatcher, ContainerInterface $container, ControllerResolverInterface $controllerResolver)
+ /**
+ * Constructs a new HttpKernel.
+ *
+ * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
+ * The event dispatcher.
+ * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+ * The dependency injection container.
+ * @param \Symfony\Component\HttpKernel\Controller\ControllerResolverInterface $controller_resolver
+ * The controller resolver.
+ * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+ * The request stack.
+ */
+ public function __construct(EventDispatcherInterface $dispatcher, ContainerInterface $container, ControllerResolverInterface $controller_resolver, RequestStack $request_stack = NULL)
{
- parent::__construct($dispatcher, $controllerResolver);
+ parent::__construct($dispatcher, $controller_resolver, $request_stack);
$this->container = $container;
}
--
GitLab