Merge branch '2.7' into 2.8

* 2.7:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks

Author: nicolas-grekas

AuthenticationEvents.php

@@ -21,8 +21,6 @@ final class AuthenticationEvents
      * Symfony\Component\Security\Core\Event\AuthenticationEvent instance.
      *
      * @Event
-     *
-     * @var string
      */
     const AUTHENTICATION_SUCCESS = 'security.authentication.success';
 
@@ -35,8 +33,6 @@ final class AuthenticationEvents
      * instance.
      *
      * @Event
-     *
-     * @var string
      */
     const AUTHENTICATION_FAILURE = 'security.authentication.failure';
 }

Encoder/BCryptPasswordEncoder.php

@@ -21,9 +21,6 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
 {
     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
      *

SecurityContext.php

@@ -48,7 +48,7 @@ class SecurityContext implements SecurityContextInterface
      *
      * @param TokenStorageInterface|AuthenticationManagerInterface         $tokenStorage
      * @param AuthorizationCheckerInterface|AccessDecisionManagerInterface $authorizationChecker
-     * @param bool                                                         $alwaysAuthenticate   only applicable with old signature
+     * @param bool                                                         $alwaysAuthenticate   Only applicable with old signature
      */
     public function __construct($tokenStorage, $authorizationChecker, $alwaysAuthenticate = false)
     {

Tests/Validator/Constraints/UserPasswordValidatorTest.php

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

Util/ClassUtils.php

@@ -28,15 +28,11 @@ class ClassUtils
 {
     /**
      * Marker for Proxy class names.
-     *
-     * @var string
      */
     const MARKER = '__CG__';
 
     /**
      * Length of the proxy marker.
-     *
-     * @var int
      */
     const MARKER_LENGTH = 6;