Merge branch '3.3' into 3.4

* 3.3:
  [Serializer] Fix extra attributes when no group specified
  [Intl] Make intl-data tests pass and save language aliases again
  [Console] Fix CommandTester::setInputs() docblock
  [Serializer] readd default argument value
  [VarDumper] fix trailling comma when dumping an exception
  Remove useless docblocks
  [FrameworkBundle] Fix docblocks
  [PropertyInfo] Remove useless docblocks

Author: nicolas-grekas

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';
 }

Encoder/BCryptPasswordEncoder.php

@@ -21,9 +21,6 @@ class BCryptPasswordEncoder extends BasePasswordEncoder implements SelfSaltingEn
 {
     const MAX_PASSWORD_LENGTH = 72;
 
-    /**
-     * @var string
-     */
     private $cost;
 
     /**

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
      *

Tests/Validator/Constraints/UserPasswordValidatorTest.php

@@ -24,7 +24,6 @@
 abstract class UserPasswordValidatorTest extends ConstraintValidatorTestCase
 {
     const PASSWORD = 's3Cr3t';
-
     const SALT = '^S4lt$';
 
     /**