Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Routing][PrefixTrait] Add the _locale requirement #36500

Merged
merged 1 commit into from Apr 21, 2020
Merged

[Routing][PrefixTrait] Add the _locale requirement #36500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@

use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
use Symfony\Component\Routing\RouteCompiler;

/**
* @author Nicolas Grekas <p@tchwork.com>
Expand Down Expand Up @@ -63,6 +64,7 @@ final public function prefix($prefix, bool $trailingSlashOnRoot = true): self
foreach ($prefix as $locale => $localePrefix) {
$localizedRoute = clone $route;
$localizedRoute->setDefault('_locale', $locale);
$localizedRoute->setRequirement('_locale', preg_quote($locale, RouteCompiler::REGEX_DELIMITER));
$localizedRoute->setDefault('_canonical_route', $name);
$localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
$this->route->add($name.'.'.$locale, $localizedRoute);
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/Routing/Loader/XmlFileLoader.php
View file
Open in desktop
Expand Up @@ -211,6 +211,7 @@ protected function parseImport(RouteCollection $collection, \DOMElement $node, $
$localizedRoute = clone $route;
$localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
$localizedRoute->setDefault('_locale', $locale);
$localizedRoute->setRequirement('_locale', preg_quote($locale, RouteCompiler::REGEX_DELIMITER));
$localizedRoute->setDefault('_canonical_route', $name);
$subCollection->add($name.'.'.$locale, $localizedRoute);
}
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/Routing/Loader/YamlFileLoader.php
View file
Open in desktop
Expand Up @@ -216,6 +216,7 @@ protected function parseImport(RouteCollection $collection, array $config, $path
foreach ($prefix as $locale => $localePrefix) {
$localizedRoute = clone $route;
$localizedRoute->setDefault('_locale', $locale);
$localizedRoute->setRequirement('_locale', preg_quote($locale, RouteCompiler::REGEX_DELIMITER));
$localizedRoute->setDefault('_canonical_route', $name);
$localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
$subCollection->add($name.'.'.$locale, $localizedRoute);
Expand Down
2 changes: 2 additions & 0 deletions src/Symfony/Component/Routing/Tests/Fixtures/php_dsl_sub_i18n.php
View file
Open in desktop
Expand Up @@ -8,4 +8,6 @@

$add('foo', ['fr' => '/foo']);
$add('bar', ['fr' => '/bar']);

$routes->add('non_localized', '/non-localized');
};
1 change: 1 addition & 0 deletions src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
View file
Open in desktop
Expand Up @@ -234,6 +234,7 @@ public function testRoutingI18nConfigurator()
$expectedCollection->add('baz.en', (new Route('/baz'))->setDefaults(['_locale' => 'en', '_canonical_route' => 'baz'])->setRequirement('_locale', 'en'));
$expectedCollection->add('c_foo.fr', (new Route('/ench/pub/foo'))->setDefaults(['_locale' => 'fr', '_canonical_route' => 'c_foo'])->setRequirement('_locale', 'fr'));
$expectedCollection->add('c_bar.fr', (new Route('/ench/pub/bar'))->setDefaults(['_locale' => 'fr', '_canonical_route' => 'c_bar'])->setRequirement('_locale', 'fr'));
$expectedCollection->add('non_localized.fr', (new Route('/ench/non-localized'))->setDefaults(['_locale' => 'fr', '_canonical_route' => 'non_localized'])->setRequirement('_locale', 'fr'));

$expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl_sub_i18n.php')));
$expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl_i18n.php')));
Expand Down
3 changes: 3 additions & 0 deletions src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
View file
Open in desktop
Expand Up @@ -201,6 +201,9 @@ public function testLocalizedImportsOfNotLocalizedRoutes()

$this->assertEquals('/le-prefix/suffix', $routeCollection->get('imported.fr')->getPath());
$this->assertEquals('/the-prefix/suffix', $routeCollection->get('imported.en')->getPath());

$this->assertSame('fr', $routeCollection->get('imported.fr')->getRequirement('_locale'));
$this->assertSame('en', $routeCollection->get('imported.en')->getRequirement('_locale'));
}

/**
Expand Down
3 changes: 3 additions & 0 deletions src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
View file
Open in desktop
Expand Up @@ -334,6 +334,9 @@ public function testImportingNonLocalizedRoutesWithLocales()
$this->assertCount(2, $routes);
$this->assertEquals('/nl/imported', $routes->get('imported.nl')->getPath());
$this->assertEquals('/en/imported', $routes->get('imported.en')->getPath());

$this->assertSame('nl', $routes->get('imported.nl')->getRequirement('_locale'));
$this->assertSame('en', $routes->get('imported.en')->getRequirement('_locale'));
}

public function testImportingRoutesWithOfficialLocales()
Expand Down