From e65a122d171262a62d0e3d0918723d9332cdd902 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Fri, 25 May 2018 09:45:06 +0200
Subject: [PATCH] fix tests

---
 .../Bundle/SecurityBundle/Tests/Functional/LogoutTest.php | 8 ++++----
 .../app/LogoutWithoutSessionInvalidation/config.yml       | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php
index d3c3b77fd5..4d5522a4f0 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php
@@ -35,18 +35,18 @@ class LogoutTest extends WebTestCase
     public function testCsrfTokensAreClearedOnLogout()
     {
         $client = $this->createClient(array('test_case' => 'LogoutWithoutSessionInvalidation', 'root_config' => 'config.yml'));
-        $client->getContainer()->get('security.csrf.token_storage')->setToken('foo', 'bar');
+        $client->getContainer()->get('test.security.csrf.token_storage')->setToken('foo', 'bar');
 
         $client->request('POST', '/login', array(
             '_username' => 'johannes',
             '_password' => 'test',
         ));
 
-        $this->assertTrue($client->getContainer()->get('security.csrf.token_storage')->hasToken('foo'));
-        $this->assertSame('bar', $client->getContainer()->get('security.csrf.token_storage')->getToken('foo'));
+        $this->assertTrue($client->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));
+        $this->assertSame('bar', $client->getContainer()->get('test.security.csrf.token_storage')->getToken('foo'));
 
         $client->request('GET', '/logout');
 
-        $this->assertFalse($client->getContainer()->get('security.csrf.token_storage')->hasToken('foo'));
+        $this->assertFalse($client->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutWithoutSessionInvalidation/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutWithoutSessionInvalidation/config.yml
index 9e5563fea5..1a4ade82b9 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutWithoutSessionInvalidation/config.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutWithoutSessionInvalidation/config.yml
@@ -1,6 +1,11 @@
 imports:
     - { resource: ./../config/framework.yml }
 
+services:
+    test.security.csrf.token_storage:
+        alias: security.csrf.token_storage
+        public: true
+
 security:
     encoders:
         Symfony\Component\Security\Core\User\User: plaintext