Merge branch '3.4' into 4.1

sroze · sroze · commit dbb73c12ef7f · 2018-09-02T18:33:37.000+01:00
* 3.4:
  Use the real image URL for the filesystem tests
  [Finder] Update PHPdoc append()
  [DI] Fix phpdoc
  Fix code examples in PHPDoc
  [HttpKernel] Fix inheritdocs
  bumped Symfony version to 3.4.16
  updated VERSION for 3.4.15
  updated CHANGELOG for 3.4.15
diff --git a/RouteCollectionBuilder.php b/RouteCollectionBuilder.php
@@ -46,7 +46,7 @@ public function __construct(LoaderInterface $loader = null)
     /**
      * Import an external routing resource and returns the RouteCollectionBuilder.
      *
-     *  $routes->import('blog.yml', '/blog');
+     *     $routes->import('blog.yml', '/blog');
      *
      * @param mixed       $resource
      * @param string|null $prefix

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function __construct(LoaderInterface $loader = null)`
`46`	`46`	`/**`
`47`	`47`	`* Import an external routing resource and returns the RouteCollectionBuilder.`
`48`	`48`	`*`
`49`		`- * $routes->import('blog.yml', '/blog');`
	`49`	`+ * $routes->import('blog.yml', '/blog');`
`50`	`50`	`*`
`51`	`51`	`* @param mixed $resource`
`52`	`52`	`* @param string\|null $prefix`