17
17
use Symfony \Component \HttpFoundation \Session \Session ;
18
18
use Symfony \Component \HttpFoundation \Session \Storage \MockArraySessionStorage ;
19
19
use Symfony \Component \Security \Core \Exception \AuthenticationException ;
20
- use Symfony \Component \Security \Core \Security ;
21
20
use Symfony \Component \Security \Http \Authentication \AuthenticationUtils ;
21
+ use Symfony \Component \Security \Http \SecurityRequestAttributes ;
22
22
23
23
class AuthenticationUtilsTest extends TestCase
24
24
{
25
25
public function testLastAuthenticationErrorWhenRequestHasAttribute ()
26
26
{
27
27
$ authenticationError = new AuthenticationException ();
28
28
$ request = Request::create ('/ ' );
29
- $ request ->attributes ->set (Security ::AUTHENTICATION_ERROR , $ authenticationError );
29
+ $ request ->attributes ->set (SecurityRequestAttributes ::AUTHENTICATION_ERROR , $ authenticationError );
30
30
31
31
$ requestStack = new RequestStack ();
32
32
$ requestStack ->push ($ request );
@@ -42,15 +42,15 @@ public function testLastAuthenticationErrorInSession()
42
42
$ request = Request::create ('/ ' );
43
43
44
44
$ session = new Session (new MockArraySessionStorage ());
45
- $ session ->set (Security ::AUTHENTICATION_ERROR , $ authenticationError );
45
+ $ session ->set (SecurityRequestAttributes ::AUTHENTICATION_ERROR , $ authenticationError );
46
46
$ request ->setSession ($ session );
47
47
48
48
$ requestStack = new RequestStack ();
49
49
$ requestStack ->push ($ request );
50
50
51
51
$ utils = new AuthenticationUtils ($ requestStack );
52
52
$ this ->assertSame ($ authenticationError , $ utils ->getLastAuthenticationError ());
53
- $ this ->assertFalse ($ session ->has (Security ::AUTHENTICATION_ERROR ));
53
+ $ this ->assertFalse ($ session ->has (SecurityRequestAttributes ::AUTHENTICATION_ERROR ));
54
54
}
55
55
56
56
public function testLastAuthenticationErrorInSessionWithoutClearing ()
@@ -60,21 +60,21 @@ public function testLastAuthenticationErrorInSessionWithoutClearing()
60
60
$ request = Request::create ('/ ' );
61
61
62
62
$ session = new Session (new MockArraySessionStorage ());
63
- $ session ->set (Security ::AUTHENTICATION_ERROR , $ authenticationError );
63
+ $ session ->set (SecurityRequestAttributes ::AUTHENTICATION_ERROR , $ authenticationError );
64
64
$ request ->setSession ($ session );
65
65
66
66
$ requestStack = new RequestStack ();
67
67
$ requestStack ->push ($ request );
68
68
69
69
$ utils = new AuthenticationUtils ($ requestStack );
70
70
$ this ->assertSame ($ authenticationError , $ utils ->getLastAuthenticationError (false ));
71
- $ this ->assertTrue ($ session ->has (Security ::AUTHENTICATION_ERROR ));
71
+ $ this ->assertTrue ($ session ->has (SecurityRequestAttributes ::AUTHENTICATION_ERROR ));
72
72
}
73
73
74
74
public function testLastUserNameIsDefinedButNull ()
75
75
{
76
76
$ request = Request::create ('/ ' );
77
- $ request ->attributes ->set (Security ::LAST_USERNAME , null );
77
+ $ request ->attributes ->set (SecurityRequestAttributes ::LAST_USERNAME , null );
78
78
79
79
$ requestStack = new RequestStack ();
80
80
$ requestStack ->push ($ request );
@@ -86,7 +86,7 @@ public function testLastUserNameIsDefinedButNull()
86
86
public function testLastUserNameIsDefined ()
87
87
{
88
88
$ request = Request::create ('/ ' );
89
- $ request ->attributes ->set (Security ::LAST_USERNAME , 'user ' );
89
+ $ request ->attributes ->set (SecurityRequestAttributes ::LAST_USERNAME , 'user ' );
90
90
91
91
$ requestStack = new RequestStack ();
92
92
$ requestStack ->push ($ request );
@@ -100,7 +100,7 @@ public function testLastUserNameIsDefinedInSessionButNull()
100
100
$ request = Request::create ('/ ' );
101
101
102
102
$ session = new Session (new MockArraySessionStorage ());
103
- $ session ->set (Security ::LAST_USERNAME , null );
103
+ $ session ->set (SecurityRequestAttributes ::LAST_USERNAME , null );
104
104
$ request ->setSession ($ session );
105
105
106
106
$ requestStack = new RequestStack ();
@@ -115,7 +115,7 @@ public function testLastUserNameIsDefinedInSession()
115
115
$ request = Request::create ('/ ' );
116
116
117
117
$ session = new Session (new MockArraySessionStorage ());
118
- $ session ->set (Security ::LAST_USERNAME , 'user ' );
118
+ $ session ->set (SecurityRequestAttributes ::LAST_USERNAME , 'user ' );
119
119
$ request ->setSession ($ session );
120
120
121
121
$ requestStack = new RequestStack ();
0 commit comments