diff --git a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php index 76f35d688b..378524c5ad 100644 --- a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php +++ b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php @@ -18,7 +18,6 @@ use Symfony\Component\Yaml\Yaml as SymfonyYaml; use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\Routing\Route; -use Drupal\Core\DependencyInjection\ContainerBuilder; /** * Defines a trait for shared functional test setup functionality. @@ -397,6 +396,8 @@ protected function initKernel(Request $request) { // disk. This forces us to not accidentally load the parent site. $container = $this->kernel->rebuildContainer(); // Add our request to the stack and route context. + $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('')); + $request->attributes->set(RouteObjectInterface::ROUTE_NAME, ''); $container->get('request_stack')->push($request); $container->get('router.request_context')->fromRequest($request); return $container; diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php index 31593cbb6d..cda276986f 100644 --- a/core/tests/Drupal/KernelTests/KernelTestBase.php +++ b/core/tests/Drupal/KernelTests/KernelTestBase.php @@ -320,18 +320,6 @@ public function getDatabasePrefix() { return $this->databasePrefix; } - private function prepareLegacyRequest(Request $request, ContainerBuilder $container) { - // Setup services which are normally initialized from within stack - // middleware or during the request kernel event. - if (PHP_SAPI !== 'cli') { - $request->setSession($this->container->get('session')); - } - $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('')); - $request->attributes->set(RouteObjectInterface::ROUTE_NAME, ''); - $container->get('request_stack')->push($request); - $container->get('router.request_context')->fromRequest($request); - } - /** * Bootstraps a kernel for a test. */ @@ -380,8 +368,11 @@ private function bootKernel() { $kernel->boot(); $kernel->preHandle($request); - // register() is only called if a new container was built/compiled. + $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('')); + $request->attributes->set(RouteObjectInterface::ROUTE_NAME, ''); $this->container = $kernel->getContainer(); + $this->container->get('request_stack')->push($request); + $this->container->get('router.request_context')->fromRequest($request); // Ensure database tasks have been run. require_once __DIR__ . '/../../../includes/install.inc'; diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php index 5b8fb0f7dc..97994a0b91 100644 --- a/core/tests/Drupal/Tests/BrowserTestBase.php +++ b/core/tests/Drupal/Tests/BrowserTestBase.php @@ -27,6 +27,7 @@ use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; use Symfony\Component\CssSelector\CssSelectorConverter; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; use Symfony\Cmf\Component\Routing\RouteObjectInterface; @@ -977,10 +978,7 @@ public function installDrupal() { $this->prepareSettings(); $this->doInstall(); $this->initSettings(); - $request = \Symfony\Component\HttpFoundation\Request::createFromGlobals(); - $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('')); - $request->attributes->set(RouteObjectInterface::ROUTE_NAME, ''); - $container = $this->initKernel($request); + $container = $this->initKernel(\Drupal::request()); $this->initConfig($container); $this->installModulesFromClassProperty($container); $this->rebuildAll();