Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit fc8250e

Browse files
fabpotfabpot
committed
fixed various inconsistencies
1 parent 586de0c commit fc8250e

8 files changed

+48
-48
lines changed

‎Tests/Acl/Permission/MaskBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function testAddAndRemove()
7676

7777
public function testGetPattern()
7878
{
79-
$builder = new MaskBuilder;
79+
$builder = new MaskBuilder();
8080
$this->assertEquals(MaskBuilder::ALL_OFF, $builder->getPattern());
8181

8282
$builder->add('view');

‎Tests/Core/Authentication/Provider/DaoAuthenticationProviderTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public function testCheckAuthenticationWhenCredentialsAreEmpty()
115115
->method('isPasswordValid')
116116
;
117117

118-
$provider = $this->getProvider(false, false, $encoder);
118+
$provider = $this->getProvider(null, null, $encoder);
119119
$method = new \ReflectionMethod($provider, 'checkAuthentication');
120120
$method->setAccessible(true);
121121

@@ -142,7 +142,7 @@ public function testCheckAuthenticationWhenCredentialsAre0()
142142
->will($this->returnValue(true))
143143
;
144144

145-
$provider = $this->getProvider(false, false, $encoder);
145+
$provider = $this->getProvider(null, null, $encoder);
146146
$method = new \ReflectionMethod($provider, 'checkAuthentication');
147147
$method->setAccessible(true);
148148

@@ -171,7 +171,7 @@ public function testCheckAuthenticationWhenCredentialsAreNotValid()
171171
->will($this->returnValue(false))
172172
;
173173

174-
$provider = $this->getProvider(false, false, $encoder);
174+
$provider = $this->getProvider(null, null, $encoder);
175175
$method = new \ReflectionMethod($provider, 'checkAuthentication');
176176
$method->setAccessible(true);
177177

@@ -206,7 +206,7 @@ public function testCheckAuthenticationDoesNotReauthenticateWhenPasswordHasChang
206206
->will($this->returnValue('newFoo'))
207207
;
208208

209-
$provider = $this->getProvider(false, false, null);
209+
$provider = $this->getProvider();
210210
$reflection = new \ReflectionMethod($provider, 'checkAuthentication');
211211
$reflection->setAccessible(true);
212212
$reflection->invoke($provider, $dbUser, $token);
@@ -231,7 +231,7 @@ public function testCheckAuthenticationWhenTokenNeedsReauthenticationWorksWithou
231231
->will($this->returnValue('foo'))
232232
;
233233

234-
$provider = $this->getProvider(false, false, null);
234+
$provider = $this->getProvider();
235235
$reflection = new \ReflectionMethod($provider, 'checkAuthentication');
236236
$reflection->setAccessible(true);
237237
$reflection->invoke($provider, $dbUser, $token);
@@ -245,7 +245,7 @@ public function testCheckAuthentication()
245245
->will($this->returnValue(true))
246246
;
247247

248-
$provider = $this->getProvider(false, false, $encoder);
248+
$provider = $this->getProvider(null, null, $encoder);
249249
$method = new \ReflectionMethod($provider, 'checkAuthentication');
250250
$method->setAccessible(true);
251251

@@ -270,17 +270,17 @@ protected function getSupportedToken()
270270
return $mock;
271271
}
272272

273-
protected function getProvider($user = false, $userChecker = false, $passwordEncoder = null)
273+
protected function getProvider($user = null, $userChecker = null, $passwordEncoder = null)
274274
{
275275
$userProvider = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface');
276-
if (false !== $user) {
276+
if (null !== $user) {
277277
$userProvider->expects($this->once())
278278
->method('loadUserByUsername')
279279
->will($this->returnValue($user))
280280
;
281281
}
282282

283-
if (false === $userChecker) {
283+
if (null === $userChecker) {
284284
$userChecker = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface');
285285
}
286286

‎Tests/Core/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,17 @@ protected function getSupportedToken($user = false, $credentials = false)
114114
return $token;
115115
}
116116

117-
protected function getProvider($user = false, $userChecker = false)
117+
protected function getProvider($user = null, $userChecker = null)
118118
{
119119
$userProvider = $this->getMock('Symfony\Component\Security\Core\User\UserProviderInterface');
120-
if (false !== $user) {
120+
if (null !== $user) {
121121
$userProvider->expects($this->once())
122122
->method('loadUserByUsername')
123123
->will($this->returnValue($user))
124124
;
125125
}
126126

127-
if (false === $userChecker) {
127+
if (null === $userChecker) {
128128
$userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
129129
}
130130

‎Tests/Core/Util/SecureRandomTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ public function testLongRun($secureRandom)
111111
{
112112
$b = $this->getBitSequence($secureRandom, 20000);
113113

114-
$longestRun = 0;
115-
$currentRun = $lastBit = null;
114+
$longestRun = $currentRun = 0;
115+
$lastBit = null;
116116
for ($i = 0; $i < 20000; $i++) {
117117
if ($lastBit === $b[$i]) {
118118
$currentRun += 1;

‎Tests/Http/RememberMe/AbstractRememberMeServicesTest.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function testAutoLoginReturnsNullWhenNoCookie()
5050
public function testAutoLoginThrowsExceptionWhenImplementationDoesNotReturnUserInterface()
5151
{
5252
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
53-
$request = new Request;
53+
$request = new Request();
5454
$request->cookies->set('foo', 'foo');
5555

5656
$service
@@ -113,8 +113,8 @@ public function testLoginFail()
113113
public function testLoginSuccessIsNotProcessedWhenTokenDoesNotContainUserInterfaceImplementation()
114114
{
115115
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null));
116-
$request = new Request;
117-
$response = new Response;
116+
$request = new Request();
117+
$response = new Response();
118118
$account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
119119
$token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
120120
$token
@@ -136,8 +136,8 @@ public function testLoginSuccessIsNotProcessedWhenTokenDoesNotContainUserInterfa
136136
public function testLoginSuccessIsNotProcessedWhenRememberMeIsNotRequested()
137137
{
138138
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => false, 'remember_me_parameter' => 'foo', 'path' => null, 'domain' => null));
139-
$request = new Request;
140-
$response = new Response;
139+
$request = new Request();
140+
$response = new Response();
141141
$account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
142142
$token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
143143
$token
@@ -160,8 +160,8 @@ public function testLoginSuccessIsNotProcessedWhenRememberMeIsNotRequested()
160160
public function testLoginSuccessWhenRememberMeAlwaysIsTrue()
161161
{
162162
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null));
163-
$request = new Request;
164-
$response = new Response;
163+
$request = new Request();
164+
$response = new Response();
165165
$account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
166166
$token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
167167
$token
@@ -186,9 +186,9 @@ public function testLoginSuccessWhenRememberMeParameterWithPathIsPositive($value
186186
{
187187
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => false, 'remember_me_parameter' => 'foo[bar]', 'path' => null, 'domain' => null));
188188

189-
$request = new Request;
189+
$request = new Request();
190190
$request->request->set('foo', array('bar' => $value));
191-
$response = new Response;
191+
$response = new Response();
192192
$account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
193193
$token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
194194
$token
@@ -213,9 +213,9 @@ public function testLoginSuccessWhenRememberMeParameterIsPositive($value)
213213
{
214214
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => false, 'remember_me_parameter' => 'foo', 'path' => null, 'domain' => null));
215215

216-
$request = new Request;
216+
$request = new Request();
217217
$request->request->set('foo', $value);
218-
$response = new Response;
218+
$response = new Response();
219219
$account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
220220
$token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
221221
$token

‎Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function testAutoLoginReturnsNullWhenNoCookie()
4343
public function testAutoLoginThrowsExceptionOnInvalidCookie()
4444
{
4545
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo'));
46-
$request = new Request;
46+
$request = new Request();
4747
$request->request->set('foo', 'true');
4848
$request->cookies->set('foo', 'foo');
4949

@@ -54,7 +54,7 @@ public function testAutoLoginThrowsExceptionOnInvalidCookie()
5454
public function testAutoLoginThrowsExceptionOnNonExistentToken()
5555
{
5656
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo'));
57-
$request = new Request;
57+
$request = new Request();
5858
$request->request->set('foo', 'true');
5959
$request->cookies->set('foo', $this->encodeCookie(array(
6060
$series = 'fooseries',
@@ -77,7 +77,7 @@ public function testAutoLoginReturnsNullOnNonExistentUser()
7777
{
7878
$userProvider = $this->getProvider();
7979
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600, 'secure' => false, 'httponly' => false));
80-
$request = new Request;
80+
$request = new Request();
8181
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
8282

8383
$tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
@@ -102,7 +102,7 @@ public function testAutoLoginThrowsExceptionOnStolenCookieAndRemovesItFromThePer
102102
{
103103
$userProvider = $this->getProvider();
104104
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true));
105-
$request = new Request;
105+
$request = new Request();
106106
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
107107

108108
$tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
@@ -132,7 +132,7 @@ public function testAutoLoginThrowsExceptionOnStolenCookieAndRemovesItFromThePer
132132
public function testAutoLoginDoesNotAcceptAnExpiredCookie()
133133
{
134134
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
135-
$request = new Request;
135+
$request = new Request();
136136
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
137137

138138
$tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
@@ -166,7 +166,7 @@ public function testAutoLogin()
166166
;
167167

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

172172
$tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
@@ -214,8 +214,8 @@ public function testLogout()
214214
public function testLogoutSimplyIgnoresNonSetRequestCookie()
215215
{
216216
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
217-
$request = new Request;
218-
$response = new Response;
217+
$request = new Request();
218+
$response = new Response();
219219
$token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
220220

221221
$tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
@@ -236,9 +236,9 @@ public function testLogoutSimplyIgnoresNonSetRequestCookie()
236236
public function testLogoutSimplyIgnoresInvalidCookie()
237237
{
238238
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
239-
$request = new Request;
239+
$request = new Request();
240240
$request->cookies->set('foo', 'somefoovalue');
241-
$response = new Response;
241+
$response = new Response();
242242
$token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
243243

244244
$tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
@@ -266,8 +266,8 @@ public function testLoginFail()
266266
public function testLoginSuccessSetsCookieWhenLoggedInWithNonRememberMeTokenInterfaceImplementation()
267267
{
268268
$service = $this->getService(null, array('name' => 'foo', 'domain' => 'myfoodomain.foo', 'path' => '/foo/path', 'secure' => true, 'httponly' => true, 'lifetime' => 3600, 'always_remember_me' => true));
269-
$request = new Request;
270-
$response = new Response;
269+
$request = new Request();
270+
$response = new Response();
271271

272272
$account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
273273
$account

‎Tests/Http/RememberMe/ResponseListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function testItSubscribesToTheOnKernelResponseEvent()
5656
{
5757
$listener = new ResponseListener();
5858

59-
$this->assertSame(array(KernelEvents::RESPONSE => 'onKernelResponse'), $listener->getSubscribedEvents());
59+
$this->assertSame(array(KernelEvents::RESPONSE => 'onKernelResponse'), ResponseListener::getSubscribedEvents());
6060
}
6161

6262
private function getRequest(array $attributes = array())

‎Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function testAutoLoginReturnsNullWhenNoCookie()
3939
public function testAutoLoginThrowsExceptionOnInvalidCookie()
4040
{
4141
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo'));
42-
$request = new Request;
42+
$request = new Request();
4343
$request->request->set('foo', 'true');
4444
$request->cookies->set('foo', 'foo');
4545

@@ -51,7 +51,7 @@ public function testAutoLoginThrowsExceptionOnNonExistentUser()
5151
{
5252
$userProvider = $this->getProvider();
5353
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
54-
$request = new Request;
54+
$request = new Request();
5555
$request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time()+3600, 'foopass'));
5656

5757
$userProvider
@@ -68,7 +68,7 @@ public function testAutoLoginDoesNotAcceptCookieWithInvalidHash()
6868
{
6969
$userProvider = $this->getProvider();
7070
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
71-
$request = new Request;
71+
$request = new Request();
7272
$request->cookies->set('foo', base64_encode('class:'.base64_encode('foouser').':123456789:fooHash'));
7373

7474
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
@@ -93,7 +93,7 @@ public function testAutoLoginDoesNotAcceptAnExpiredCookie()
9393
{
9494
$userProvider = $this->getProvider();
9595
$service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
96-
$request = new Request;
96+
$request = new Request();
9797
$request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time() - 1, 'foopass'));
9898

9999
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
@@ -137,7 +137,7 @@ public function testAutoLogin()
137137
;
138138

139139
$service = $this->getService($userProvider, array('name' => 'foo', 'always_remember_me' => true, 'lifetime' => 3600));
140-
$request = new Request;
140+
$request = new Request();
141141
$request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time()+3600, 'foopass'));
142142

143143
$returnedToken = $service->autoLogin($request);
@@ -179,8 +179,8 @@ public function testLoginFail()
179179
public function testLoginSuccessIgnoresTokensWhichDoNotContainAnUserInterfaceImplementation()
180180
{
181181
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null));
182-
$request = new Request;
183-
$response = new Response;
182+
$request = new Request();
183+
$response = new Response();
184184
$token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
185185
$token
186186
->expects($this->once())
@@ -200,8 +200,8 @@ public function testLoginSuccessIgnoresTokensWhichDoNotContainAnUserInterfaceImp
200200
public function testLoginSuccess()
201201
{
202202
$service = $this->getService(null, array('name' => 'foo', 'domain' => 'myfoodomain.foo', 'path' => '/foo/path', 'secure' => true, 'httponly' => true, 'lifetime' => 3600, 'always_remember_me' => true));
203-
$request = new Request;
204-
$response = new Response;
203+
$request = new Request();
204+
$response = new Response();
205205

206206
$token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
207207
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');

0 commit comments

Comments
 (0)