summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDariusz Ruminski <dariusz.ruminski@gmail.com>2015-02-18 08:05:44 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2015-03-02 15:15:25 +0100
commit89ef6872e8c64eede0d4e6f7d03f0d654ddf2a42 (patch)
treea8004fee66158e5afae5583a46a85f07fb68cb22
parent5d5a4e20a8f5db004e045a5b8137a6d455272ee4 (diff)
downloadsymfony-security-89ef6872e8c64eede0d4e6f7d03f0d654ddf2a42.zip
symfony-security-89ef6872e8c64eede0d4e6f7d03f0d654ddf2a42.tar.gz
symfony-security-89ef6872e8c64eede0d4e6f7d03f0d654ddf2a42.tar.bz2
CS fixes
-rw-r--r--Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php2
-rw-r--r--Tests/Acl/Voter/AclVoterTest.php12
-rw-r--r--Tests/Http/Firewall/RememberMeListenerTest.php8
3 files changed, 11 insertions, 11 deletions
diff --git a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
index a73c244..87b7114 100644
--- a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
+++ b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -60,7 +60,7 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
throw new BadCredentialsException('No pre-authenticated principal found in request.');
}
- $user = $this->userProvider->loadUserByUsername($user);
+ $user = $this->userProvider->loadUserByUsername($user);
$this->userChecker->checkPostAuth($user);
diff --git a/Tests/Acl/Voter/AclVoterTest.php b/Tests/Acl/Voter/AclVoterTest.php
index 57f9d1b..8544b19 100644
--- a/Tests/Acl/Voter/AclVoterTest.php
+++ b/Tests/Acl/Voter/AclVoterTest.php
@@ -27,7 +27,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
*/
public function testSupportsAttribute($attribute, $supported)
{
- list($voter, , $permissionMap, ,) = $this->getVoter(true, false);
+ list($voter, , $permissionMap) = $this->getVoter(true, false);
$permissionMap
->expects($this->once())
@@ -44,7 +44,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
*/
public function testSupportsAttributeNonString($attribute)
{
- list($voter, , , , ,) = $this->getVoter(true, false);
+ list($voter) = $this->getVoter(true, false);
$this->assertFalse($voter->supportsAttribute($attribute));
}
@@ -72,7 +72,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
*/
public function testSupportsClass($class)
{
- list($voter, , , ,) = $this->getVoter();
+ list($voter) = $this->getVoter();
$this->assertTrue($voter->supportsClass($class));
}
@@ -88,7 +88,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
public function testVote()
{
- list($voter, , $permissionMap, ,) = $this->getVoter();
+ list($voter, , $permissionMap) = $this->getVoter();
$permissionMap
->expects($this->atLeastOnce())
->method('getMasks')
@@ -103,7 +103,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
*/
public function testVoteWhenNoObjectIsPassed($allowIfObjectIdentityUnavailable)
{
- list($voter, , $permissionMap, ,) = $this->getVoter($allowIfObjectIdentityUnavailable);
+ list($voter, , $permissionMap) = $this->getVoter($allowIfObjectIdentityUnavailable);
$permissionMap
->expects($this->once())
->method('getMasks')
@@ -124,7 +124,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
*/
public function testVoteWhenOidStrategyReturnsNull($allowIfUnavailable)
{
- list($voter, , $permissionMap, $oidStrategy,) = $this->getVoter($allowIfUnavailable);
+ list($voter, , $permissionMap, $oidStrategy) = $this->getVoter($allowIfUnavailable);
$permissionMap
->expects($this->once())
->method('getMasks')
diff --git a/Tests/Http/Firewall/RememberMeListenerTest.php b/Tests/Http/Firewall/RememberMeListenerTest.php
index 3624f11..067cacb 100644
--- a/Tests/Http/Firewall/RememberMeListenerTest.php
+++ b/Tests/Http/Firewall/RememberMeListenerTest.php
@@ -19,7 +19,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
{
public function testOnCoreSecurityDoesNotTryToPopulateNonEmptySecurityContext()
{
- list($listener, $context, $service, ,) = $this->getListener();
+ list($listener, $context, $service) = $this->getListener();
$context
->expects($this->once())
@@ -37,7 +37,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
{
- list($listener, $context, $service, ,) = $this->getListener();
+ list($listener, $context, $service) = $this->getListener();
$context
->expects($this->once())
@@ -63,7 +63,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenticationManagerImplementation()
{
- list($listener, $context, $service, $manager,) = $this->getListener();
+ list($listener, $context, $service, $manager) = $this->getListener();
$context
->expects($this->once())
@@ -101,7 +101,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
public function testOnCoreSecurity()
{
- list($listener, $context, $service, $manager,) = $this->getListener();
+ list($listener, $context, $service, $manager) = $this->getListener();
$context
->expects($this->once())