diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Routing] Add missing _locale requirements

Browse Source 
Co-authored-by: Nicolas Grekas <nicolas.grekas@gmail.com>
This commit is contained in:
Thomas Calvet 2020-04-20 14:15:01 +02:00
parent 95becc4078
commit 9fd62f79fb
7 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php
View File

@ -13,6 +13,7 @@ namespace Symfony\Component\Routing\Loader\Configurator;
use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
use Symfony\Component\Routing\RouteCompiler;
/**
* @author Nicolas Grekas <p@tchwork.com>
@ -63,6 +64,7 @@ class ImportConfigurator
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);

1
src/Symfony/Component/Routing/Loader/XmlFileLoader.php
View File

@ -211,6 +211,7 @@ class XmlFileLoader extends FileLoader
$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);
}

1
src/Symfony/Component/Routing/Loader/YamlFileLoader.php
View File

@ -216,6 +216,7 @@ class YamlFileLoader extends FileLoader
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);

2
src/Symfony/Component/Routing/Tests/Fixtures/php_dsl_sub_i18n.php
View File

@ -8,4 +8,6 @@ return function (RoutingConfigurator $routes) {
$add('foo', ['fr' => '/foo']);
$add('bar', ['fr' => '/bar']);
$routes->add('non_localized', '/non-localized');
};

1
src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
View File

@ -234,6 +234,7 @@ class PhpFileLoaderTest extends TestCase
$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')));

3
src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
View File

@ -201,6 +201,9 @@ class XmlFileLoaderTest extends TestCase
$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'));
}
/**

3
src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
View File

@ -334,6 +334,9 @@ class YamlFileLoaderTest extends TestCase
$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()