Merge branch '2.6' into 2.7

fabpot · fabpot · commit 34bcfc3debc0 · 2015-05-15T15:53:44.000+02:00
* 2.6:
  fixed CS
  fixed CS

Conflicts:
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
diff --git a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -60,7 +60,7 @@ public function authenticate(TokenInterface $token)
             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/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
@@ -18,7 +18,7 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @group  legacy
  */
-class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest
+class LegacyUserPasswordValidatorTest extends UserPasswordValidatorTest
 {
     protected function getApiVersion()
     {
diff --git a/Http/Tests/Firewall/RememberMeListenerTest.php b/Http/Tests/Firewall/RememberMeListenerTest.php
@@ -106,7 +106,7 @@ public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenti
      */
     public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation()
     {
-        list($listener, $tokenStorage, $service, $manager,) = $this->getListener(false, false);
+        list($listener, $tokenStorage, $service, $manager) = $this->getListener(false, false);
 
         $tokenStorage
             ->expects($this->once())

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function authenticate(TokenInterface $token)`
`60`	`60`	`throw new BadCredentialsException('No pre-authenticated principal found in request.');`
`61`	`61`	`}`
`62`	`62`
`63`		`- $user = $this->userProvider->loadUserByUsername($user);`
	`63`	`+ $user = $this->userProvider->loadUserByUsername($user);`
`64`	`64`
`65`	`65`	`$this->userChecker->checkPostAuth($user);`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`19`	`19`	`* @group legacy`
`20`	`20`	`*/`
`21`		`-class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest`
	`21`	`+class LegacyUserPasswordValidatorTest extends UserPasswordValidatorTest`
`22`	`22`	`{`
`23`	`23`	`protected function getApiVersion()`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenti`
`106`	`106`	`*/`
`107`	`107`	`public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation()`
`108`	`108`	`{`
`109`		`- list($listener, $tokenStorage, $service, $manager,) = $this->getListener(false, false);`
	`109`	`+ list($listener, $tokenStorage, $service, $manager) = $this->getListener(false, false);`
`110`	`110`
`111`	`111`	`$tokenStorage`
`112`	`112`	`->expects($this->once())`