Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 46dd05c4c148 · 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/EventListener/SessionListener.php b/EventListener/SessionListener.php
@@ -21,9 +21,6 @@
  */
 class SessionListener extends BaseSessionListener
 {
-    /**
-     * @var ContainerInterface
-     */
     private $container;
 
     public function __construct(ContainerInterface $container)
diff --git a/Translation/TranslationLoader.php b/Translation/TranslationLoader.php
@@ -43,8 +43,8 @@ public function addLoader($format, LoaderInterface $loader)
     /**
      * Loads translation messages from a directory to the catalogue.
      *
-     * @param string           $directory the directory to look into
-     * @param MessageCatalogue $catalogue the catalogue
+     * @param string           $directory The directory to look into
+     * @param MessageCatalogue $catalogue The catalogue
      */
     public function loadMessages($directory, MessageCatalogue $catalogue)
     {

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,6 @@`
`21`	`21`	`*/`
`22`	`22`	`class SessionListener extends BaseSessionListener`
`23`	`23`	`{`
`24`		`- /**`
`25`		`- * @var ContainerInterface`
`26`		`- */`
`27`	`24`	`private $container;`
`28`	`25`
`29`	`26`	`public function __construct(ContainerInterface $container)`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ public function addLoader($format, LoaderInterface $loader)`
`43`	`43`	`/**`
`44`	`44`	`* Loads translation messages from a directory to the catalogue.`
`45`	`45`	`*`
`46`		`- * @param string $directory the directory to look into`
`47`		`- * @param MessageCatalogue $catalogue the catalogue`
	`46`	`+ * @param string $directory The directory to look into`
	`47`	`+ * @param MessageCatalogue $catalogue The catalogue`
`48`	`48`	`*/`
`49`	`49`	`public function loadMessages($directory, MessageCatalogue $catalogue)`
`50`	`50`	`{`