diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
index 5d45655c21149..b4791faf740a9 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
@@ -165,13 +165,13 @@ public function findAcls(array $oids, array $sids = array())
             if ((self::MAX_BATCH_SIZE === count($currentBatch) || ($i + 1) === $c) && count($currentBatch) > 0) {
                 try {
                     $loadedBatch = $this->lookupObjectIdentities($currentBatch, $sids, $oidLookup);
-                } catch (AclNotFoundException $aclNotFoundexception) {
+                } catch (AclNotFoundException $aclNotFoundException) {
                     if ($result->count()) {
                         $partialResultException = new NotAllAclsFoundException('The provider could not find ACLs for all object identities.');
                         $partialResultException->setPartialResult($result);
                         throw $partialResultException;
                     } else {
-                        throw $aclNotFoundexception;
+                        throw $aclNotFoundException;
                     }
                 }
                 foreach ($loadedBatch as $loadedOid) {
diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
index 29d3cfd640ae1..e857c687c3c57 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
@@ -253,7 +253,7 @@ public function updateAcl(MutableAclInterface $acl)
             }
 
             // check properties for deleted, and created ACEs, and perform deletions
-            // we need to perfom deletions before updating existing ACEs, in order to
+            // we need to perform deletions before updating existing ACEs, in order to
             // preserve uniqueness of the order field
             if (isset($propertyChanges['classAces'])) {
                 $this->updateOldAceProperty('classAces', $propertyChanges['classAces']);
@@ -360,7 +360,7 @@ public function updateAcl(MutableAclInterface $acl)
     protected function getDeleteAccessControlEntriesSql($oidPK)
     {
         return sprintf(
-              'DELETE FROM %s WHERE object_identity_id = %d',
+            'DELETE FROM %s WHERE object_identity_id = %d',
             $this->options['entry_table_name'],
             $oidPK
         );
@@ -806,7 +806,7 @@ private function updateNewFieldAceProperty($name, array $changes)
      * @param string $name
      * @param array $changes
      */
-    private function updateOldFieldAceProperty($ane, array $changes)
+    private function updateOldFieldAceProperty($name, array $changes)
     {
         $currentIds = array();
         foreach ($changes[1] as $field => $new) {
@@ -925,11 +925,12 @@ private function updateAce(\SplObjectStorage $aces, $ace)
         if (isset($propertyChanges['aceOrder'])
             && $propertyChanges['aceOrder'][1] > $propertyChanges['aceOrder'][0]
             && $propertyChanges == $aces->offsetGet($ace)) {
-                $aces->next();
-                if ($aces->valid()) {
+
+            $aces->next();
+            if ($aces->valid()) {
                     $this->updateAce($aces, $aces->current());
-                }
             }
+        }
 
         if (isset($propertyChanges['mask'])) {
             $sets[] = sprintf('mask = %d', $propertyChanges['mask'][1]);
@@ -949,5 +950,4 @@ private function updateAce(\SplObjectStorage $aces, $ace)
 
         $this->connection->executeQuery($this->getUpdateAccessControlEntrySql($ace->getId(), $sets));
     }
-
 }
diff --git a/src/Symfony/Component/Security/Acl/Tests/Domain/AuditLoggerTest.php b/src/Symfony/Component/Security/Acl/Tests/Domain/AuditLoggerTest.php
index fe56b8cbea8e5..15538d346245a 100644
--- a/src/Symfony/Component/Security/Acl/Tests/Domain/AuditLoggerTest.php
+++ b/src/Symfony/Component/Security/Acl/Tests/Domain/AuditLoggerTest.php
@@ -26,12 +26,12 @@ public function testLogIfNeeded($granting, $audit)
                 ->expects($this->once())
                 ->method('isAuditSuccess')
                 ->will($this->returnValue($audit))
-           ;
+            ;
 
-           $ace
+            $ace
                ->expects($this->never())
                ->method('isAuditFailure')
-           ;
+            ;
         } else {
             $ace
                 ->expects($this->never())
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
index 3affd7805a404..f4d09590ef413 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -47,23 +47,22 @@ public function __construct(UserProviderInterface $userProvider, UserCheckerInte
         $this->providerKey = $providerKey;
     }
 
-     /**
-      * {@inheritdoc}
-      */
-     public function authenticate(TokenInterface $token)
-     {
-         if (!$this->supports($token)) {
-             return null;
-         }
-
+    /**
+     * {@inheritdoc}
+     */
+    public function authenticate(TokenInterface $token)
+    {
+        if (!$this->supports($token)) {
+            return null;
+        }
         if (!$user = $token->getUser()) {
             throw new BadCredentialsException('No pre-authenticated principal found in request.');
         }
-/*
+        /*
         if (null === $token->getCredentials()) {
             throw new BadCredentialsException('No pre-authenticated credentials found in request.');
         }
-*/
+        */
         $user = $this->userProvider->loadUserByUsername($user);
 
         $this->userChecker->checkPostAuth($user);
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
index 09953acc41f88..bf6683d193007 100644
--- a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
+++ b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
@@ -32,7 +32,9 @@ class ExpressionVoter implements VoterInterface
     /**
      * Constructor.
      *
-     * @param ExpressionLanguage $expressionLanguage
+     * @param ExpressionLanguage                   $expressionLanguage
+     * @param AuthenticationTrustResolverInterface $trustResolver
+     * @param RoleHierarchyInterface               $roleHierarchy
      */
     public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null)
     {
diff --git a/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
index b83eb3050dcb9..aa298767118f8 100644
--- a/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
@@ -89,6 +89,8 @@ protected function comparePasswords($password1, $password2)
     /**
      * Checks if the password is too long.
      *
+     * @param string $password The password
+     *
      * @return Boolean true if the password is too long, false otherwise
      */
     protected function isPasswordTooLong($password)
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
index f331f0ede52f1..110e05cf2845a 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
@@ -87,7 +87,7 @@ public function testExitUserUpdatesToken()
 
         $this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('_exit'));
         $this->request->expects($this->any())->method('getUri')->will($this->returnValue('/'));
-        $this->request->query->expects($this->once())->method('remove','_switch_user');
+        $this->request->query->expects($this->once())->method('remove', '_switch_user');
         $this->request->query->expects($this->any())->method('all')->will($this->returnValue(array()));
         $this->request->server->expects($this->once())->method('set')->with('QUERY_STRING', '');
 
@@ -103,7 +103,7 @@ public function testExitUserUpdatesToken()
     /**
      * @expectedException \Symfony\Component\Security\Core\Exception\AccessDeniedException
      */
-    public function testSwitchUserIsDissallowed()
+    public function testSwitchUserIsDisallowed()
     {
         $token = $this->getToken(array($this->getMock('Symfony\Component\Security\Core\Role\RoleInterface')));
 
@@ -126,7 +126,7 @@ public function testSwitchUser()
 
         $this->securityContext->expects($this->any())->method('getToken')->will($this->returnValue($token));
         $this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('kuba'));
-        $this->request->query->expects($this->once())->method('remove','_switch_user');
+        $this->request->query->expects($this->once())->method('remove', '_switch_user');
         $this->request->query->expects($this->any())->method('all')->will($this->returnValue(array()));
 
         $this->request->expects($this->any())->method('getUri')->will($this->returnValue('/'));
@@ -156,7 +156,7 @@ public function testSwitchUserKeepsOtherQueryStringParameters()
 
         $this->securityContext->expects($this->any())->method('getToken')->will($this->returnValue($token));
         $this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('kuba'));
-        $this->request->query->expects($this->once())->method('remove','_switch_user');
+        $this->request->query->expects($this->once())->method('remove', '_switch_user');
         $this->request->query->expects($this->any())->method('all')->will($this->returnValue(array('page'=>3,'section'=>2)));
         $this->request->expects($this->any())->method('getUri')->will($this->returnValue('/'));
         $this->request->server->expects($this->once())->method('set')->with('QUERY_STRING', 'page=3&section=2');
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
index 17245912e631f..7725f4beac2d4 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
@@ -57,7 +57,7 @@ public static function dataProviderGetPreAuthenticatedData()
     }
 
     /**
-     * @expectedException Symfony\Component\Security\Core\Exception\BadCredentialsException
+     * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
      */
     public function testGetPreAuthenticatedDataNoUser()
     {