diff -u b/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php b/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php --- b/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php @@ -56,8 +56,6 @@ $request = Request::create('/'); $request->attributes->set(RouteObjectInterface::ROUTE_NAME, ''); $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('/')); - // Fake a started session. - $request->cookies->add(['SESS' . substr(hash('sha256', $this->getDatabasePrefix()), 0, 32) => '']); $request_stack->push($request); $request_context->fromRequest($request); @@ -65,6 +63,8 @@ $request = Request::create('/'); $request->attributes->set(RouteObjectInterface::ROUTE_NAME, ''); $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('/')); + // Fake a started session. + $request->cookies->add(['SESS' . substr(hash('sha256', $this->getDatabasePrefix()), 0, 32) => '']); $request_stack->push($request); $request_context->fromRequest($request); diff -u b/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php b/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php --- b/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php +++ b/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php @@ -41,7 +41,6 @@ ->disableOriginalConstructor() ->getMock(); - $this->processor = new RouteProcessorCsrf($this->csrfToken); $this->sessionConfiguration = $this->createMock('Drupal\Core\Session\SessionConfigurationInterface'); $request_stack = $this->createMock('Symfony\Component\HttpFoundation\RequestStack'); @@ -154,7 +153,7 @@ $this->sessionConfiguration->expects($this->once()) ->method('hasSession') ->willReturn(TRUE); - + $route = new Route('{slug_1}/test-path/{slug_2}', [], ['_csrf_token' => 'TRUE']); $parameters = ['slug_1' => 100, 'slug_2' => 'test'];