Skip to content

Commit 0b7814a

Browse files
fabpotfabpot
committed
fixed CS
1 parent 8e4f865 commit 0b7814a

File tree

3 files changed

+45
-45
lines changed

3 files changed

+45
-45
lines changed

‎Tests/FirewallTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function testOnKernelRequestRegistersExceptionListener()
4141
->expects($this->once())
4242
->method('getListeners')
4343
->with($this->equalTo($request))
44-
->will($this->returnValue(array(array(), $listener, null)))
44+
->will($this->returnValue([[], $listener, null]))
4545
;
4646

4747
$event = new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, HttpKernelInterface::MASTER_REQUEST);
@@ -70,16 +70,16 @@ public function testOnKernelRequestStopsWhenThereIsAResponse()
7070
$map
7171
->expects($this->once())
7272
->method('getListeners')
73-
->will($this->returnValue(array(array($first, $second), null, null)))
73+
->will($this->returnValue([[$first, $second], null, null]))
7474
;
7575

7676
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
77-
->setMethods(array('hasResponse'))
78-
->setConstructorArgs(array(
77+
->setMethods(['hasResponse'])
78+
->setConstructorArgs([
7979
$this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(),
8080
$this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock(),
8181
HttpKernelInterface::MASTER_REQUEST,
82-
))
82+
])
8383
->getMock()
8484
;
8585
$event
@@ -134,7 +134,7 @@ public function testMissingLogoutListener()
134134
->expects($this->once())
135135
->method('getListeners')
136136
->with($this->equalTo($request))
137-
->willReturn(array(array(), $listener))
137+
->willReturn([[], $listener])
138138
;
139139

140140
$firewall = new Firewall($map, $dispatcher);

‎Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ public static function setUpBeforeClass()
3636

3737
public function testAutoLoginReturnsNullWhenNoCookie()
3838
{
39-
$service = $this->getService(null, array('name' => 'foo'));
39+
$service = $this->getService(null, ['name' => 'foo']);
4040

4141
$this->assertNull($service->autoLogin(new Request()));
4242
}
4343

4444
public function testAutoLoginThrowsExceptionOnInvalidCookie()
4545
{
46-
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo'));
46+
$service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo']);
4747
$request = new Request();
4848
$request->request->set('foo', 'true');
4949
$request->cookies->set('foo', 'foo');
@@ -54,13 +54,13 @@ public function testAutoLoginThrowsExceptionOnInvalidCookie()
5454

5555
public function testAutoLoginThrowsExceptionOnNonExistentToken()
5656
{
57-
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo'));
57+
$service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo']);
5858
$request = new Request();
5959
$request->request->set('foo', 'true');
60-
$request->cookies->set('foo', $this->encodeCookie(array(
60+
$request->cookies->set('foo', $this->encodeCookie([
6161
$series = 'fooseries',
6262
$tokenValue = 'foovalue',
63-
)));
63+
]));
6464

6565
$tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
6666
$tokenProvider
@@ -77,9 +77,9 @@ public function testAutoLoginThrowsExceptionOnNonExistentToken()
7777
public function testAutoLoginReturnsNullOnNonExistentUser()
7878
{
7979
$userProvider = $this->getProvider();
80-
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600, 'secure' => false, 'httponly' => false));
80+
$service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600, 'secure' => false, 'httponly' => false]);
8181
$request = new Request();
82-
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
82+
$request->cookies->set('foo', $this->encodeCookie(['fooseries', 'foovalue']));
8383

8484
$tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
8585
$tokenProvider
@@ -102,9 +102,9 @@ public function testAutoLoginReturnsNullOnNonExistentUser()
102102
public function testAutoLoginThrowsExceptionOnStolenCookieAndRemovesItFromThePersistentBackend()
103103
{
104104
$userProvider = $this->getProvider();
105-
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true));
105+
$service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true]);
106106
$request = new Request();
107-
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
107+
$request->cookies->set('foo', $this->encodeCookie(['fooseries', 'foovalue']));
108108

109109
$tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
110110
$service->setTokenProvider($tokenProvider);
@@ -133,9 +133,9 @@ public function testAutoLoginThrowsExceptionOnStolenCookieAndRemovesItFromThePer
133133

134134
public function testAutoLoginDoesNotAcceptAnExpiredCookie()
135135
{
136-
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
136+
$service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600]);
137137
$request = new Request();
138-
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
138+
$request->cookies->set('foo', $this->encodeCookie(['fooseries', 'foovalue']));
139139

140140
$tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
141141
$tokenProvider
@@ -156,7 +156,7 @@ public function testAutoLogin()
156156
$user
157157
->expects($this->once())
158158
->method('getRoles')
159-
->will($this->returnValue(array('ROLE_FOO')))
159+
->will($this->returnValue(['ROLE_FOO']))
160160
;
161161

162162
$userProvider = $this->getProvider();
@@ -167,9 +167,9 @@ public function testAutoLogin()
167167
->will($this->returnValue($user))
168168
;
169169

170-
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'secure' => false, 'httponly' => false, 'always_remember_me' => true, 'lifetime' => 3600));
170+
$service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'secure' => false, 'httponly' => false, 'always_remember_me' => true, 'lifetime' => 3600]);
171171
$request = new Request();
172-
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
172+
$request->cookies->set('foo', $this->encodeCookie(['fooseries', 'foovalue']));
173173

174174
$tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
175175
$tokenProvider
@@ -190,9 +190,9 @@ public function testAutoLogin()
190190

191191
public function testLogout()
192192
{
193-
$service = $this->getService(null, array('name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo', 'secure' => true, 'httponly' => false));
193+
$service = $this->getService(null, ['name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo', 'secure' => true, 'httponly' => false]);
194194
$request = new Request();
195-
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
195+
$request->cookies->set('foo', $this->encodeCookie(['fooseries', 'foovalue']));
196196
$response = new Response();
197197
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
198198

@@ -217,7 +217,7 @@ public function testLogout()
217217

218218
public function testLogoutSimplyIgnoresNonSetRequestCookie()
219219
{
220-
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
220+
$service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
221221
$request = new Request();
222222
$response = new Response();
223223
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
@@ -239,7 +239,7 @@ public function testLogoutSimplyIgnoresNonSetRequestCookie()
239239

240240
public function testLogoutSimplyIgnoresInvalidCookie()
241241
{
242-
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
242+
$service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
243243
$request = new Request();
244244
$request->cookies->set('foo', 'somefoovalue');
245245
$response = new Response();
@@ -259,7 +259,7 @@ public function testLogoutSimplyIgnoresInvalidCookie()
259259

260260
public function testLoginFail()
261261
{
262-
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
262+
$service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
263263
$request = new Request();
264264

265265
$this->assertFalse($request->attributes->has(RememberMeServicesInterface::COOKIE_ATTR_NAME));
@@ -269,7 +269,7 @@ public function testLoginFail()
269269

270270
public function testLoginSuccessSetsCookieWhenLoggedInWithNonRememberMeTokenInterfaceImplementation()
271271
{
272-
$service = $this->getService(null, array('name' => 'foo', 'domain' => 'myfoodomain.foo', 'path' => '/foo/path', 'secure' => true, 'httponly' => true, 'samesite' => Cookie::SAMESITE_STRICT, 'lifetime' => 3600, 'always_remember_me' => true));
272+
$service = $this->getService(null, ['name' => 'foo', 'domain' => 'myfoodomain.foo', 'path' => '/foo/path', 'secure' => true, 'httponly' => true, 'samesite' => Cookie::SAMESITE_STRICT, 'lifetime' => 3600, 'always_remember_me' => true]);
273273
$request = new Request();
274274
$response = new Response();
275275

@@ -318,13 +318,13 @@ protected function encodeCookie(array $parts)
318318
return $r->invoke($service, $parts);
319319
}
320320

321-
protected function getService($userProvider = null, $options = array(), $logger = null)
321+
protected function getService($userProvider = null, $options = [], $logger = null)
322322
{
323323
if (null === $userProvider) {
324324
$userProvider = $this->getProvider();
325325
}
326326

327-
return new PersistentTokenBasedRememberMeServices(array($userProvider), 'foosecret', 'fookey', $options, $logger);
327+
return new PersistentTokenBasedRememberMeServices([$userProvider], 'foosecret', 'fookey', $options, $logger);
328328
}
329329

330330
protected function getProvider()

‎Tests/RememberMe/TokenBasedRememberMeServicesTest.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ class TokenBasedRememberMeServicesTest extends TestCase
2424
{
2525
public function testAutoLoginReturnsNullWhenNoCookie()
2626
{
27-
$service = $this->getService(null, array('name' => 'foo'));
27+
$service = $this->getService(null, ['name' => 'foo']);
2828

2929
$this->assertNull($service->autoLogin(new Request()));
3030
}
3131

3232
public function testAutoLoginThrowsExceptionOnInvalidCookie()
3333
{
34-
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo'));
34+
$service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo']);
3535
$request = new Request();
3636
$request->request->set('foo', 'true');
3737
$request->cookies->set('foo', 'foo');
@@ -43,7 +43,7 @@ public function testAutoLoginThrowsExceptionOnInvalidCookie()
4343
public function testAutoLoginThrowsExceptionOnNonExistentUser()
4444
{
4545
$userProvider = $this->getProvider();
46-
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
46+
$service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600]);
4747
$request = new Request();
4848
$request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time() + 3600, 'foopass'));
4949

@@ -60,7 +60,7 @@ public function testAutoLoginThrowsExceptionOnNonExistentUser()
6060
public function testAutoLoginDoesNotAcceptCookieWithInvalidHash()
6161
{
6262
$userProvider = $this->getProvider();
63-
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
63+
$service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600]);
6464
$request = new Request();
6565
$request->cookies->set('foo', base64_encode('class:'.base64_encode('foouser').':123456789:fooHash'));
6666

@@ -85,7 +85,7 @@ public function testAutoLoginDoesNotAcceptCookieWithInvalidHash()
8585
public function testAutoLoginDoesNotAcceptAnExpiredCookie()
8686
{
8787
$userProvider = $this->getProvider();
88-
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
88+
$service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600]);
8989
$request = new Request();
9090
$request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time() - 1, 'foopass'));
9191

@@ -118,7 +118,7 @@ public function testAutoLogin($username)
118118
$user
119119
->expects($this->once())
120120
->method('getRoles')
121-
->will($this->returnValue(array('ROLE_FOO')))
121+
->will($this->returnValue(['ROLE_FOO']))
122122
;
123123
$user
124124
->expects($this->once())
@@ -134,7 +134,7 @@ public function testAutoLogin($username)
134134
->will($this->returnValue($user))
135135
;
136136

137-
$service = $this->getService($userProvider, array('name' => 'foo', 'always_remember_me' => true, 'lifetime' => 3600));
137+
$service = $this->getService($userProvider, ['name' => 'foo', 'always_remember_me' => true, 'lifetime' => 3600]);
138138
$request = new Request();
139139
$request->cookies->set('foo', $this->getCookie('fooclass', $username, time() + 3600, 'foopass'));
140140

@@ -147,15 +147,15 @@ public function testAutoLogin($username)
147147

148148
public function provideUsernamesForAutoLogin()
149149
{
150-
return array(
151-
array('foouser', 'Simple username'),
152-
array('foo'.TokenBasedRememberMeServices::COOKIE_DELIMITER.'user', 'Username might contain the delimiter'),
153-
);
150+
return [
151+
['foouser', 'Simple username'],
152+
['foo'.TokenBasedRememberMeServices::COOKIE_DELIMITER.'user', 'Username might contain the delimiter'],
153+
];
154154
}
155155

156156
public function testLogout()
157157
{
158-
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'secure' => true, 'httponly' => false));
158+
$service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null, 'secure' => true, 'httponly' => false]);
159159
$request = new Request();
160160
$response = new Response();
161161
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
@@ -172,7 +172,7 @@ public function testLogout()
172172

173173
public function testLoginFail()
174174
{
175-
$service = $this->getService(null, array('name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo'));
175+
$service = $this->getService(null, ['name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo']);
176176
$request = new Request();
177177

178178
$service->loginFail($request);
@@ -185,7 +185,7 @@ public function testLoginFail()
185185

186186
public function testLoginSuccessIgnoresTokensWhichDoNotContainAnUserInterfaceImplementation()
187187
{
188-
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null));
188+
$service = $this->getService(null, ['name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null]);
189189
$request = new Request();
190190
$response = new Response();
191191
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
@@ -206,7 +206,7 @@ public function testLoginSuccessIgnoresTokensWhichDoNotContainAnUserInterfaceImp
206206

207207
public function testLoginSuccess()
208208
{
209-
$service = $this->getService(null, array('name' => 'foo', 'domain' => 'myfoodomain.foo', 'path' => '/foo/path', 'secure' => true, 'httponly' => true, 'samesite' => Cookie::SAMESITE_STRICT, 'lifetime' => 3600, 'always_remember_me' => true));
209+
$service = $this->getService(null, ['name' => 'foo', 'domain' => 'myfoodomain.foo', 'path' => '/foo/path', 'secure' => true, 'httponly' => true, 'samesite' => Cookie::SAMESITE_STRICT, 'lifetime' => 3600, 'always_remember_me' => true]);
210210
$request = new Request();
211211
$response = new Response();
212212

@@ -262,13 +262,13 @@ protected function encodeCookie(array $parts)
262262
return $r->invoke($service, $parts);
263263
}
264264

265-
protected function getService($userProvider = null, $options = array(), $logger = null)
265+
protected function getService($userProvider = null, $options = [], $logger = null)
266266
{
267267
if (null === $userProvider) {
268268
$userProvider = $this->getProvider();
269269
}
270270

271-
$service = new TokenBasedRememberMeServices(array($userProvider), 'foosecret', 'fookey', $options, $logger);
271+
$service = new TokenBasedRememberMeServices([$userProvider], 'foosecret', 'fookey', $options, $logger);
272272

273273
return $service;
274274
}

0 commit comments

Comments
 (0)