Skip to content

Commit 19be3f5

Browse files
Merge branch '4.1'
* 4.1: Undeprecate the single-colon notation for controllers Command::addOption should allow int in $default Update symfony links to https [Form] Fixed keeping hash of equal \DateTimeInterface on submit [PhpUnitBridge] Fix typo [Routing] generate(null) should throw an exception [Form] Minor fixes in docs and cs [Workflow] Made code simpler [Config] Unset key during normalization [Form] Fixed empty data for compound date types invalidate forms on transformation failures [FrameworkBundle] fixed guard event names for transitions method buildTransitionBlockerList returns TransitionBlockerList of expected transition [FrameworkBundle] fixed guard event names for transitions [PropertyAccessor] Fix unable to write to singular property using setter while plural adder/remover exist
2 parents 2f9dc0a + b656c3d commit 19be3f5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Generator/Dumper/PhpGeneratorDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public function generate($name, $parameters = array(), $referenceType = self::AB
113113
?? $this->context->getParameter('_locale')
114114
?: $this->defaultLocale;
115115
116-
if (null !== $locale) {
116+
if (null !== $locale && null !== $name) {
117117
do {
118118
if ((self::$declaredRoutes[$name.'.'.$locale][1]['_canonical_route'] ?? null) === $name) {
119119
unset($parameters['_locale']);

0 commit comments

Comments
 (0)