Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit c0894b1a2183 · 2018-05-25T13:23:22.000+02:00
* 3.4:
  [SecurityBundle] fix test
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php
@@ -35,18 +35,18 @@ public function testSessionLessRememberMeLogout()
     public function testCsrfTokensAreClearedOnLogout()
     {
         $client = $this->createClient(array('test_case' => 'LogoutWithoutSessionInvalidation', 'root_config' => 'config.yml'));
-        $client->getContainer()->get('test.security.csrf.token_storage')->setToken('foo', 'bar');
+        static::$kernel->getContainer()->get('test.security.csrf.token_storage')->setToken('foo', 'bar');
 
         $client->request('POST', '/login', array(
             '_username' => 'johannes',
             '_password' => 'test',
         ));
 
-        $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'));
+        $this->assertTrue(static::$kernel->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));
+        $this->assertSame('bar', static::$kernel->getContainer()->get('test.security.csrf.token_storage')->getToken('foo'));
 
         $client->request('GET', '/logout');
 
-        $this->assertFalse($client->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));
+        $this->assertFalse(static::$kernel->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,18 +35,18 @@ public function testSessionLessRememberMeLogout()`
`35`	`35`	`public function testCsrfTokensAreClearedOnLogout()`
`36`	`36`	`{`
`37`	`37`	`$client = $this->createClient(array('test_case' => 'LogoutWithoutSessionInvalidation', 'root_config' => 'config.yml'));`
`38`		`- $client->getContainer()->get('test.security.csrf.token_storage')->setToken('foo', 'bar');`
	`38`	`+ static::$kernel->getContainer()->get('test.security.csrf.token_storage')->setToken('foo', 'bar');`
`39`	`39`
`40`	`40`	`$client->request('POST', '/login', array(`
`41`	`41`	`'_username' => 'johannes',`
`42`	`42`	`'_password' => 'test',`
`43`	`43`	`));`
`44`	`44`
`45`		`- $this->assertTrue($client->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));`
`46`		`- $this->assertSame('bar', $client->getContainer()->get('test.security.csrf.token_storage')->getToken('foo'));`
	`45`	`+ $this->assertTrue(static::$kernel->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));`
	`46`	`+ $this->assertSame('bar', static::$kernel->getContainer()->get('test.security.csrf.token_storage')->getToken('foo'));`
`47`	`47`
`48`	`48`	`$client->request('GET', '/logout');`
`49`	`49`
`50`		`- $this->assertFalse($client->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));`
	`50`	`+ $this->assertFalse(static::$kernel->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));`
`51`	`51`	`}`
`52`	`52`	`}`