fix merge (bis)
This commit is contained in:
parent
5105062e7a
commit
7ff6fb0b21
@ -13,7 +13,6 @@ namespace Symfony\Component\Routing\Loader\Configurator\Traits;
|
||||
|
||||
use Symfony\Component\Routing\Route;
|
||||
use Symfony\Component\Routing\RouteCollection;
|
||||
use Symfony\Component\Routing\RouteCompiler;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
@ -34,7 +33,7 @@ trait PrefixTrait
|
||||
foreach ($prefix as $locale => $localePrefix) {
|
||||
$localizedRoute = clone $route;
|
||||
$localizedRoute->setDefault('_locale', $locale);
|
||||
$localizedRoute->setRequirement('_locale', preg_quote($locale, RouteCompiler::REGEX_DELIMITER));
|
||||
$localizedRoute->setRequirement('_locale', preg_quote($locale));
|
||||
$localizedRoute->setDefault('_canonical_route', $name);
|
||||
$localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
|
||||
$routes->add($name.'.'.$locale, $localizedRoute);
|
||||
|
@ -563,6 +563,6 @@ class Route implements \Serializable
|
||||
|
||||
private function isLocalized(): bool
|
||||
{
|
||||
return isset($this->defaults['_locale']) && isset($this->defaults['_canonical_route']) && ($this->requirements['_locale'] ?? null) === preg_quote($this->defaults['_locale'], RouteCompiler::REGEX_DELIMITER);
|
||||
return isset($this->defaults['_locale']) && isset($this->defaults['_canonical_route']) && ($this->requirements['_locale'] ?? null) === preg_quote($this->defaults['_locale']);
|
||||
}
|
||||
}
|
||||
|
@ -65,7 +65,7 @@ class RouteCompiler implements RouteCompilerInterface
|
||||
}
|
||||
|
||||
$locale = $route->getDefault('_locale');
|
||||
if (null !== $locale && null !== $route->getDefault('_canonical_route') && preg_quote($locale, self::REGEX_DELIMITER) === $route->getRequirement('_locale')) {
|
||||
if (null !== $locale && null !== $route->getDefault('_canonical_route') && preg_quote($locale) === $route->getRequirement('_locale')) {
|
||||
$requirements = $route->getRequirements();
|
||||
unset($requirements['_locale']);
|
||||
$route->setRequirements($requirements);
|
||||
|
Reference in New Issue
Block a user