Skip to content

Commit 819fb22

Browse files
Merge branch '3.4'
* 3.4: [DI] Handle container.autowiring.strict_mode to opt-out from legacy autowiring [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 [DI] Register default env var provided types Fix phpdoc and unnecessary sprintf [FrameworkBundle][Workflow] Fix deprectation when checking workflow.registry service in dump command [Security] Fix BC layer for AbstractGuardAuthenticator subclasses Prefer line formatter on missing cli dumper [DI] Enhance service locator error message
2 parents 61d9102 + 6865d19 commit 819fb22

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Loader/Configurator/CollectionConfigurator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function __destruct()
4242
* Adds a route.
4343
*
4444
* @param string $name
45-
* @param string $value
45+
* @param string $path
4646
*
4747
* @return RouteConfigurator
4848
*/

RouteCollectionBuilder.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ class RouteCollectionBuilder
3838
private $methods;
3939
private $resources = array();
4040

41-
/**
42-
* @param LoaderInterface $loader
43-
*/
4441
public function __construct(LoaderInterface $loader = null)
4542
{
4643
$this->loader = $loader;

0 commit comments

Comments
 (0)