Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit ede11c10977b · 2017-11-05T16:25:56.000+01:00
* 2.7:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks
diff --git a/RememberMe/RememberMeServicesInterface.php b/RememberMe/RememberMeServicesInterface.php
@@ -30,8 +30,6 @@ interface RememberMeServicesInterface
     /**
      * This attribute name can be used by the implementation if it needs to set
      * a cookie on the Request when there is no actual Response, yet.
-     *
-     * @var string
      */
     const COOKIE_ATTR_NAME = '_security_remember_me_cookie';
 
diff --git a/SecurityEvents.php b/SecurityEvents.php
@@ -24,8 +24,6 @@ final class SecurityEvents
      * Symfony\Component\Security\Http\Event\InteractiveLoginEvent instance.
      *
      * @Event
-     *
-     * @var string
      */
     const INTERACTIVE_LOGIN = 'security.interactive_login';
 
@@ -37,8 +35,6 @@ final class SecurityEvents
      * Symfony\Component\Security\Http\Event\SwitchUserEvent instance.
      *
      * @Event
-     *
-     * @var string
      */
     const SWITCH_USER = 'security.switch_user';
 }

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ final class SecurityEvents`
`24`	`24`	`* Symfony\Component\Security\Http\Event\InteractiveLoginEvent instance.`
`25`	`25`	`*`
`26`	`26`	`* @Event`
`27`		`- *`
`28`		`- * @var string`
`29`	`27`	`*/`
`30`	`28`	`const INTERACTIVE_LOGIN = 'security.interactive_login';`
`31`	`29`
`@@ -37,8 +35,6 @@ final class SecurityEvents`
`37`	`35`	`* Symfony\Component\Security\Http\Event\SwitchUserEvent instance.`
`38`	`36`	`*`
`39`	`37`	`* @Event`
`40`		`- *`
`41`		`- * @var string`
`42`	`38`	`*/`
`43`	`39`	`const SWITCH_USER = 'security.switch_user';`
`44`	`40`	`}`