[Routing] Fix i18n routing when the url contains the locale #35101
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8d1a488 to
9c08a1c
Compare
fancyweb
commented
Dec 24, 2019
| @@ -53,6 +52,16 @@ public function generate($name, $parameters = [], $referenceType = self::ABSOLUT | |||
|
|
|||
| list($variables, $defaults, $requirements, $tokens, $hostTokens, $requiredSchemes) = $this->compiledRoutes[$name]; | |||
|
|
|||
| if (isset($defaults['_canonical_route']) && isset($defaults['_locale'])) { | |||
There was a problem hiding this comment.
This if = we are in i18n routing. Checking isset($defaults['_locale']) is a safety.
fancyweb
commented
Dec 24, 2019
| $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_canonical_route', 'test')); | ||
| $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_canonical_route', 'test')); | ||
| $this->routeCollection->add('test.fr', (new Route('/tester/est/amusant'))->setDefault('_canonical_route', 'test')); | ||
| $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')); |
There was a problem hiding this comment.
When a route is i18n, it always has a default _locale. The test must reflect that (same for the other ones).
fancyweb
commented
Dec 24, 2019
src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php
Show resolved
Hide resolved
fancyweb
commented
Dec 24, 2019
src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php
Show resolved
Hide resolved
fancyweb
commented
Dec 24, 2019
| @@ -40,7 +40,6 @@ public function generate($name, $parameters = [], $referenceType = self::ABSOLUT | |||
| if (null !== $locale) { | |||
| do { | |||
| if (($this->compiledRoutes[$name.'.'.$locale][1]['_canonical_route'] ?? null) === $name) { | |||
| unset($parameters['_locale']); | |||
There was a problem hiding this comment.
Not needed anymore because it is handled by the new code.
There was a problem hiding this comment.
wouldn't it be OK to do $parameters['_locale'] = $locale here, and remove the other changes?
There was a problem hiding this comment.
No because it's not enough to handle the case where the generator locale is "fr" + you just ask for the "foo.en" route. In this case the locale remains "fr".
fancyweb
commented
Dec 24, 2019
| $parameters['_locale'] = $defaults['_locale']; | ||
| } | ||
| } else { | ||
| unset($parameters['_locale']); |
There was a problem hiding this comment.
We always unset the _locale parameter if the url does not have the _locale variable because the good i18n route has already been found and we don't want the parameter.
fancyweb
commented
Dec 24, 2019
src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php
Show resolved
Hide resolved
src/Symfony/Component/Routing/Generator/CompiledUrlGenerator.php
Outdated
Show resolved
Hide resolved
9c08a1c to
cd40bb8
Compare
nicolas-grekas
approved these changes
Jan 4, 2020
|
Thank you @fancyweb. |
nicolas-grekas
added a commit
that referenced
this pull request
Jan 4, 2020
…e (fancyweb) This PR was merged into the 4.3 branch. Discussion ---------- [Routing] Fix i18n routing when the url contains the locale | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #34469 | License | MIT | Doc PR | - This PR fixes different scenarios with i18n routing. Commits ------- cd40bb8 [Routing] Fix i18n routing when the url contains the locale
This was referenced Jan 21, 2020
Merged
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes different scenarios with i18n routing.