Merge branch '2.6' into 2.7

* 2.6:
  fixed CS
  fixed CS

Conflicts:
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php

src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php

@@ -18,7 +18,7 @@ use Symfony\Component\Validator\Validation;
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @group  legacy
  */
-class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest
+class LegacyUserPasswordValidatorTest extends UserPasswordValidatorTest
 {
     protected function getApiVersion()
     {

src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php

@@ -106,7 +106,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
      */
     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())

src/Symfony/Component/Validator/Constraints/False.php

@@ -21,4 +21,6 @@ trigger_error('The '.__NAMESPACE__.'\False class is deprecated since version 2.7
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsFalse instead.
  */
-class False extends IsFalse {}
+class False extends IsFalse
+{
+}

src/Symfony/Component/Validator/Constraints/FalseValidator.php

@@ -18,4 +18,6 @@ trigger_error('The '.__NAMESPACE__.'\FalseValidator class is deprecated since ve
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsFalseValidator instead.
  */
-class FalseValidator extends IsFalseValidator {}
+class FalseValidator extends IsFalseValidator
+{
+}

src/Symfony/Component/Validator/Constraints/Null.php

@@ -21,4 +21,6 @@ trigger_error('The '.__NAMESPACE__.'\Null class is deprecated since version 2.7
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsNull instead.
  */
-class Null extends IsNull {}
+class Null extends IsNull
+{
+}

src/Symfony/Component/Validator/Constraints/NullValidator.php

@@ -18,4 +18,6 @@ trigger_error('The '.__NAMESPACE__.'\NullValidator class is deprecated since ver
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsNullValidator instead.
  */
-class NullValidator extends IsNullValidator {}
+class NullValidator extends IsNullValidator
+{
+}

src/Symfony/Component/Validator/Constraints/True.php

@@ -21,4 +21,6 @@ trigger_error('The '.__NAMESPACE__.'\True class is deprecated since version 2.7
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsTrue instead.
  */
-class True extends IsTrue {}
+class True extends IsTrue
+{
+}

src/Symfony/Component/Validator/Constraints/TrueValidator.php

@@ -18,4 +18,6 @@ trigger_error('The '.__NAMESPACE__.'\TrueValidator class is deprecated since ver
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsTrueValidator instead.
  */
-class TrueValidator extends IsTrueValidator {}
+class TrueValidator extends IsTrueValidator
+{
+}