Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 86b070bffe4f · 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/Loader/PhpFileLoader.php b/Loader/PhpFileLoader.php
@@ -55,7 +55,7 @@ public function supports($resource, $type = null)
      * Safe include. Used for scope isolation.
      *
      * @param string        $file   File to include
-     * @param PhpFileLoader $loader the loader variable is exposed to the included file below
+     * @param PhpFileLoader $loader The loader variable is exposed to the included file below
      *
      * @return RouteCollection
      */
diff --git a/Matcher/Dumper/DumperRoute.php b/Matcher/Dumper/DumperRoute.php
@@ -22,14 +22,7 @@
  */
 class DumperRoute
 {
-    /**
-     * @var string
-     */
     private $name;
-
-    /**
-     * @var Route
-     */
     private $route;
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function supports($resource, $type = null)`
`55`	`55`	`* Safe include. Used for scope isolation.`
`56`	`56`	`*`
`57`	`57`	`* @param string $file File to include`
`58`		`- * @param PhpFileLoader $loader the loader variable is exposed to the included file below`
	`58`	`+ * @param PhpFileLoader $loader The loader variable is exposed to the included file below`
`59`	`59`	`*`
`60`	`60`	`* @return RouteCollection`
`61`	`61`	`*/`