Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit 6865d19cd6d3 · 2017-10-24T14:44:53.000+02:00
* 3.3:
  [2.8] Fix some docblocks
  Escape trailing \ in QuestionHelper autocompletion
  [FrameworkBundle][Serializer] Remove outdated condition
  Add "doctrine/annotations" to top-level composer.json
  Fix phpdoc inconsistencies, simplify no-op sprintf.
  Remove inapplicable phpdoc comment
  nit: Fix phpdoc inconsistency and unreachable statement
  Prefer line formatter on missing cli dumper
  [DI] Enhance service locator error message
diff --git a/RouteCollectionBuilder.php b/RouteCollectionBuilder.php
@@ -38,9 +38,6 @@ class RouteCollectionBuilder
     private $methods;
     private $resources = array();
 
-    /**
-     * @param LoaderInterface $loader
-     */
     public function __construct(LoaderInterface $loader = null)
     {
         $this->loader = $loader;

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,6 @@ class RouteCollectionBuilder`
`38`	`38`	`private $methods;`
`39`	`39`	`private $resources = array();`
`40`	`40`
`41`		`- /**`
`42`		`- * @param LoaderInterface $loader`
`43`		`- */`
`44`	`41`	`public function __construct(LoaderInterface $loader = null)`
`45`	`42`	`{`
`46`	`43`	`$this->loader = $loader;`