[2.6] CS Fixes And Removed An Unused Import

5 files changed, 10 insertions, 9 deletions

diff --git a/Core/Authorization/Voter/AbstractVoter.php b/Core/Authorization/Voter/AbstractVoter.php
index 5d51090..43ca558 100644
--- a/Core/Authorization/Voter/AbstractVoter.php
+++ b/Core/Authorization/Voter/AbstractVoter.php
@@ -54,7 +54,7 @@ abstract class AbstractVoter implements VoterInterface
      * @param object         $object     The object to secure
      * @param array          $attributes An array of attributes associated with the method being invoked
      *
-     * @return int     either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED
+     * @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED
      */
     public function vote(TokenInterface $token, $object, array $attributes)
     {
@@ -85,14 +85,14 @@ abstract class AbstractVoter implements VoterInterface
     /**
      * Return an array of supported classes. This will be called by supportsClass
      *
-     * @return array    an array of supported classes, i.e. array('Acme\DemoBundle\Model\Product')
+     * @return array an array of supported classes, i.e. array('Acme\DemoBundle\Model\Product')
      */
     abstract protected function getSupportedClasses();
 
     /**
      * Return an array of supported attributes. This will be called by supportsAttribute
      *
-     * @return array    an array of supported attributes, i.e. array('CREATE', 'READ')
+     * @return array an array of supported attributes, i.e. array('CREATE', 'READ')
      */
     abstract protected function getSupportedAttributes();
 
diff --git a/Http/Authentication/AuthenticationUtils.php b/Http/Authentication/AuthenticationUtils.php
index 38763dc..317c8a0 100644
--- a/Http/Authentication/AuthenticationUtils.php
+++ b/Http/Authentication/AuthenticationUtils.php
@@ -38,7 +38,8 @@ class AuthenticationUtils
 
     /**
      * @param bool $clearSession
-     * @return null|AuthenticationException
+     *
+     * @return AuthenticationException|null
      */
     public function getLastAuthenticationError($clearSession = true)
     {
diff --git a/Http/Authentication/CustomAuthenticationFailureHandler.php b/Http/Authentication/CustomAuthenticationFailureHandler.php
index 35bfc05..36d4a78 100644
--- a/Http/Authentication/CustomAuthenticationFailureHandler.php
+++ b/Http/Authentication/CustomAuthenticationFailureHandler.php
@@ -24,8 +24,8 @@ class CustomAuthenticationFailureHandler implements AuthenticationFailureHandler
     /**
      * Constructor.
      *
-     * @param AuthenticationFailureHandlerInterface $handler     An AuthenticationFailureHandlerInterface instance
-     * @param array                                 $options     Options for processing a successful authentication attempt
+     * @param AuthenticationFailureHandlerInterface $handler An AuthenticationFailureHandlerInterface instance
+     * @param array                                 $options Options for processing a successful authentication attempt
      */
     public function __construct(AuthenticationFailureHandlerInterface $handler, array $options)
     {
diff --git a/Http/Tests/Firewall/RememberMeListenerTest.php b/Http/Tests/Firewall/RememberMeListenerTest.php
index 4a33ed1..edc27a1 100644
--- a/Http/Tests/Firewall/RememberMeListenerTest.php
+++ b/Http/Tests/Firewall/RememberMeListenerTest.php
@@ -183,7 +183,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
 
     public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherIsPresent()
     {
-        list($listener, $context, $service, $manager,, $dispatcher) = $this->getListener(true);
+        list($listener, $context, $service, $manager, , $dispatcher) = $this->getListener(true);
 
         $context
             ->expects($this->once())
diff --git a/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php b/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
index 2bc1ad6..6e6b979 100644
--- a/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
+++ b/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
@@ -19,7 +19,7 @@ class RemoteUserAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
     public function testGetPreAuthenticatedData()
     {
         $serverVars = array(
-            'REMOTE_USER' => 'TheUser'
+            'REMOTE_USER' => 'TheUser',
         );
 
         $request = new Request(array(), array(), array(), array(), array(), $serverVars);
@@ -69,7 +69,7 @@ class RemoteUserAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
         $userCredentials = array('TheUser', null);
 
         $request = new Request(array(), array(), array(), array(), array(), array(
-            'TheUserKey' => 'TheUser'
+            'TheUserKey' => 'TheUser',
         ));
         $context = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface');