Commit 4e2a1c37 authored by webchick's avatar webchick

Issue #2187097 by dawehner, tim.plunkett: Add a request_stack service and use...

Issue #2187097 by dawehner, tim.plunkett: Add a request_stack service and use it for the http kernel.
parent 12592a2e
......@@ -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']
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment