Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit b48e3e0abac2 · 2017-11-05T17:26:21.000+01:00
* 3.4:
  [HttpFoundation] refactoring: calculate when need
  [Serializer] Fix extra attributes when no group specified
  [Intl] Make intl-data tests pass and save language aliases again
  [FrameworkBundle][Config] fix: do not add resource checkers for debug=false
  [DI] Fix "almost-circular" dependencies handling
  [Console] Fix CommandTester::setInputs() docblock
  Only enabling validation if it is present
  Fix displaying errors for bootstrap 4
  [Serializer] readd default argument value
  Fix reference dump for deprecated nodes
  [PhpUnitBridge] Fixed fatal error in CoverageListener when something goes wrong in Test::setUpBeforeClass
  [HttpKernel] Let the storage manage the session starts
  [VarDumper] fix trailling comma when dumping an exception
  [Validator] Fix TraceableValidator is reset on data collector instantiation
  Remove useless docblocks
  [FrameworkBundle] Fix docblocks
  [PropertyInfo] Remove useless docblocks
diff --git a/AuthenticationEvents.php b/AuthenticationEvents.php
@@ -18,8 +18,6 @@ final class AuthenticationEvents
      * by one provider.
      *
      * @Event("Symfony\Component\Security\Core\Event\AuthenticationEvent")
-     *
-     * @var string
      */
     const AUTHENTICATION_SUCCESS = 'security.authentication.success';
 
@@ -28,8 +26,6 @@ final class AuthenticationEvents
      * authenticated by any of the providers.
      *
      * @Event("Symfony\Component\Security\Core\Event\AuthenticationFailureEvent")
-     *
-     * @var string
      */
     const AUTHENTICATION_FAILURE = 'security.authentication.failure';
 }
diff --git a/Encoder/BCryptPasswordEncoder.php b/Encoder/BCryptPasswordEncoder.php
@@ -21,9 +21,6 @@ class BCryptPasswordEncoder extends BasePasswordEncoder implements SelfSaltingEn
 {
     const MAX_PASSWORD_LENGTH = 72;
 
-    /**
-     * @var string
-     */
     private $cost;
 
     /**
diff --git a/Encoder/BasePasswordEncoder.php b/Encoder/BasePasswordEncoder.php
@@ -48,8 +48,8 @@ protected function demergePasswordAndSalt($mergedPasswordSalt)
     /**
      * Merges a password and a salt.
      *
-     * @param string $password the password to be used
-     * @param string $salt     the salt to be used
+     * @param string $password The password to be used
+     * @param string $salt     The salt to be used
      *
      * @return string a merged password and salt
      *
diff --git a/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/Tests/Validator/Constraints/UserPasswordValidatorTest.php
@@ -24,7 +24,6 @@
 abstract class UserPasswordValidatorTest extends ConstraintValidatorTestCase
 {
     const PASSWORD = 's3Cr3t';
-
     const SALT = '^S4lt$';
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ final class AuthenticationEvents`
`18`	`18`	`* by one provider.`
`19`	`19`	`*`
`20`	`20`	`* @Event("Symfony\Component\Security\Core\Event\AuthenticationEvent")`
`21`		`- *`
`22`		`- * @var string`
`23`	`21`	`*/`
`24`	`22`	`const AUTHENTICATION_SUCCESS = 'security.authentication.success';`
`25`	`23`
`@@ -28,8 +26,6 @@ final class AuthenticationEvents`
`28`	`26`	`* authenticated by any of the providers.`
`29`	`27`	`*`
`30`	`28`	`* @Event("Symfony\Component\Security\Core\Event\AuthenticationFailureEvent")`
`31`		`- *`
`32`		`- * @var string`
`33`	`29`	`*/`
`34`	`30`	`const AUTHENTICATION_FAILURE = 'security.authentication.failure';`
`35`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,6 @@ class BCryptPasswordEncoder extends BasePasswordEncoder implements SelfSaltingEn`
`21`	`21`	`{`
`22`	`22`	`const MAX_PASSWORD_LENGTH = 72;`
`23`	`23`
`24`		`- /**`
`25`		`- * @var string`
`26`		`- */`
`27`	`24`	`private $cost;`
`28`	`25`
`29`	`26`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ protected function demergePasswordAndSalt($mergedPasswordSalt)`
`48`	`48`	`/**`
`49`	`49`	`* Merges a password and a salt.`
`50`	`50`	`*`
`51`		`- * @param string $password the password to be used`
`52`		`- * @param string $salt the salt to be used`
	`51`	`+ * @param string $password The password to be used`
	`52`	`+ * @param string $salt The salt to be used`
`53`	`53`	`*`
`54`	`54`	`* @return string a merged password and salt`
`55`	`55`	`*`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`abstract class UserPasswordValidatorTest extends ConstraintValidatorTestCase`
`25`	`25`	`{`
`26`	`26`	`const PASSWORD = 's3Cr3t';`
`27`		`-`
`28`	`27`	`const SALT = '^S4lt$';`
`29`	`28`
`30`	`29`	`/**`