Skip to content

Commit 7067d69

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.3
* 6.4: [Routing] Fix case sensitivity for static host matching in compiled routes [Routing] Fix localized prefix updates breaking aliases [Routing] Fix addNamePrefix breaking aliases to external routes [Workflow] Fix MethodMarkingStore crash with inherited uninitialized properties [AssetMapper] Fix entrypoint status lost during update [Console] Fix completion for global options values
2 parents 221f1d0 + cf2709f commit 7067d69

File tree

12 files changed

+186
-10
lines changed

12 files changed

+186
-10
lines changed

‎src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ private function updateImportMapConfig(bool $update, array $packagesToRequire, a
112112
$entry->packageModuleSpecifier,
113113
null,
114114
$importName,
115+
null,
116+
$entry->isEntrypoint,
115117
);
116118

117119
// remove it: then it will be re-added

‎src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,34 @@ public static function getPackageNameTests(): iterable
366366
];
367367
}
368368

369+
public function testUpdatePreservesEntrypointStatus()
370+
{
371+
$manager = $this->createImportMapManager();
372+
373+
$this->mockImportMap([
374+
self::createRemoteEntry('my_entrypoint', version: '1.0.0', isEntrypoint: true),
375+
self::createRemoteEntry('standard_lib', version: '2.0.0', isEntrypoint: false),
376+
]);
377+
378+
$this->packageResolver->expects($this->once())
379+
->method('resolvePackages')
380+
->willReturn([
381+
self::resolvedPackage('my_entrypoint', '1.0.1', isEntrypoint: true),
382+
self::resolvedPackage('standard_lib', '2.1.0'),
383+
]);
384+
385+
$this->configReader->expects($this->once())
386+
->method('writeEntries')
387+
->with($this->callback(function (ImportMapEntries $entries) {
388+
$this->assertTrue($entries->get('my_entrypoint')->isEntrypoint, 'Entrypoint status lost!');
389+
$this->assertFalse($entries->get('standard_lib')->isEntrypoint);
390+
391+
return true;
392+
}));
393+
394+
$manager->update();
395+
}
396+
369397
private function createImportMapManager(): ImportMapManager
370398
{
371399
$this->assetMapper = $this->createMock(AssetMapperInterface::class);
@@ -390,10 +418,10 @@ private function createImportMapManager(): ImportMapManager
390418
);
391419
}
392420

393-
private static function resolvedPackage(string $packageName, string $version, ImportMapType $type = ImportMapType::JS)
421+
private static function resolvedPackage(string $packageName, string $version, ImportMapType $type = ImportMapType::JS, bool $isEntrypoint = false)
394422
{
395423
return new ResolvedImportMapPackage(
396-
new PackageRequireOptions($packageName),
424+
new PackageRequireOptions($packageName, entrypoint: $isEntrypoint),
397425
$version,
398426
$type,
399427
);
@@ -417,11 +445,11 @@ private static function createLocalEntry(string $importName, string $path, Impor
417445
return ImportMapEntry::createLocal($importName, $type, path: $path, isEntrypoint: $isEntrypoint);
418446
}
419447

420-
private static function createRemoteEntry(string $importName, string $version, ?string $path = null, ImportMapType $type = ImportMapType::JS, ?string $packageSpecifier = null): ImportMapEntry
448+
private static function createRemoteEntry(string $importName, string $version, ?string $path = null, ImportMapType $type = ImportMapType::JS, ?string $packageSpecifier = null, bool $isEntrypoint = false): ImportMapEntry
421449
{
422450
$packageSpecifier = $packageSpecifier ?? $importName;
423451
$path = $path ?? '/vendor/any-path.js';
424452

425-
return ImportMapEntry::createRemote($importName, $type, path: $path, version: $version, packageModuleSpecifier: $packageSpecifier, isEntrypoint: false);
453+
return ImportMapEntry::createRemote($importName, $type, path: $path, version: $version, packageModuleSpecifier: $packageSpecifier, isEntrypoint: $isEntrypoint);
426454
}
427455
}

‎src/Symfony/Component/Console/Application.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,15 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
424424
if (CompletionInput::TYPE_OPTION_NAME === $input->getCompletionType()) {
425425
$suggestions->suggestOptions($this->getDefinition()->getOptions());
426426
}
427+
428+
if (
429+
CompletionInput::TYPE_OPTION_VALUE === $input->getCompletionType()
430+
&& ($definition = $this->getDefinition())->hasOption($input->getCompletionName())
431+
) {
432+
$definition->getOption($input->getCompletionName())->complete($input, $suggestions);
433+
434+
return;
435+
}
427436
}
428437

429438
/**

‎src/Symfony/Component/Console/Tests/Command/CompleteCommandTest.php‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Symfony\Component\Console\Completion\CompletionSuggestions;
2020
use Symfony\Component\Console\Completion\Output\BashCompletionOutput;
2121
use Symfony\Component\Console\Input\InputArgument;
22+
use Symfony\Component\Console\Input\InputOption;
2223
use Symfony\Component\Console\Output\OutputInterface;
2324
use Symfony\Component\Console\Tester\CommandTester;
2425

@@ -34,6 +35,8 @@ protected function setUp(): void
3435

3536
$this->application = new Application();
3637
$this->application->add(new CompleteCommandTest_HelloCommand());
38+
$this->application->getDefinition()
39+
->addOption(new InputOption('global-option', null, InputOption::VALUE_REQUIRED, suggestedValues: ['foo', 'bar', 'baz']));
3740

3841
$this->command->setApplication($this->application);
3942
$this->tester = new CommandTester($this->command);
@@ -119,10 +122,12 @@ public function testCompleteCommandInputDefinition(array $input, array $suggesti
119122

120123
public static function provideCompleteCommandInputDefinitionInputs()
121124
{
122-
yield 'definition' => [['bin/console', 'hello', '-'], ['--help', '--silent', '--quiet', '--verbose', '--version', '--ansi', '--no-ansi', '--no-interaction']];
125+
yield 'definition' => [['bin/console', 'hello', '-'], ['--help', '--silent', '--quiet', '--verbose', '--version', '--ansi', '--no-ansi', '--no-interaction', '--global-option']];
123126
yield 'custom' => [['bin/console', 'hello'], ['Fabien', 'Robin', 'Wouter']];
124-
yield 'definition-aliased' => [['bin/console', 'ahoy', '-'], ['--help', '--silent', '--quiet', '--verbose', '--version', '--ansi', '--no-ansi', '--no-interaction']];
127+
yield 'definition-aliased' => [['bin/console', 'ahoy', '-'], ['--help', '--silent', '--quiet', '--verbose', '--version', '--ansi', '--no-ansi', '--no-interaction', '--global-option']];
125128
yield 'custom-aliased' => [['bin/console', 'ahoy'], ['Fabien', 'Robin', 'Wouter']];
129+
yield 'global-option-values' => [['bin/console', '--global-option'], ['foo', 'bar', 'baz']];
130+
yield 'global-option-with-command-values' => [['bin/console', 'ahoy', '--global-option'], ['foo', 'bar', 'baz']];
126131
}
127132

128133
private function execute(array $input)
@@ -147,6 +152,10 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
147152
{
148153
if ($input->mustSuggestArgumentValuesFor('name')) {
149154
$suggestions->suggestValues(['Fabien', 'Robin', 'Wouter']);
155+
156+
return;
150157
}
158+
159+
parent::complete($input, $suggestions);
151160
}
152161
}

‎src/Symfony/Component/Routing/Loader/Configurator/Traits/PrefixTrait.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,27 @@ final protected function addPrefix(RouteCollection $routes, string|array $prefix
2727
foreach ($prefix as $locale => $localePrefix) {
2828
$prefix[$locale] = trim(trim($localePrefix), '/');
2929
}
30+
$aliases = [];
31+
foreach ($routes->getAliases() as $name => $alias) {
32+
$aliases[$alias->getId()][] = $name;
33+
}
3034
foreach ($routes->all() as $name => $route) {
3135
if (null === $locale = $route->getDefault('_locale')) {
3236
$priority = $routes->getPriority($name) ?? 0;
3337
$routes->remove($name);
38+
foreach ($aliases[$name] ?? [] as $aliasName) {
39+
$routes->remove($aliasName);
40+
}
3441
foreach ($prefix as $locale => $localePrefix) {
3542
$localizedRoute = clone $route;
3643
$localizedRoute->setDefault('_locale', $locale);
3744
$localizedRoute->setRequirement('_locale', preg_quote($locale));
3845
$localizedRoute->setDefault('_canonical_route', $name);
3946
$localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
4047
$routes->add($name.'.'.$locale, $localizedRoute, $priority);
48+
foreach ($aliases[$name] ?? [] as $aliasName) {
49+
$routes->addAlias($aliasName.'.'.$locale, $name.'.'.$locale);
50+
}
4151
}
4252
} elseif (!isset($prefix[$locale])) {
4353
throw new \InvalidArgumentException(\sprintf('Route "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $name, $locale));

‎src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,12 @@ private function compileStaticRoutes(array $staticRoutes, array &$conditions): a
219219
foreach ($staticRoutes as $url => $routes) {
220220
$compiledRoutes[$url] = [];
221221
foreach ($routes as $name => [$route, $hasTrailingSlash]) {
222-
$compiledRoutes[$url][] = $this->compileRoute($route, $name, (!$route->compile()->getHostVariables() ? $route->getHost() : $route->compile()->getHostRegex()) ?: null, $hasTrailingSlash, false, $conditions);
222+
if ($route->compile()->getHostVariables()) {
223+
$host = $route->compile()->getHostRegex();
224+
} elseif ($host = $route->getHost()) {
225+
$host = strtolower($host);
226+
}
227+
$compiledRoutes[$url][] = $this->compileRoute($route, $name, $host ?: null, $hasTrailingSlash, false, $conditions);
223228
}
224229
}
225230

‎src/Symfony/Component/Routing/RouteCollection.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,13 @@ public function addNamePrefix(string $prefix): void
228228
}
229229

230230
foreach ($this->aliases as $name => $alias) {
231-
$prefixedAliases[$prefix.$name] = $alias->withId($prefix.$alias->getId());
231+
$targetId = $alias->getId();
232+
233+
if (isset($this->routes[$targetId]) || isset($this->aliases[$targetId])) {
234+
$targetId = $prefix.$targetId;
235+
}
236+
237+
$prefixedAliases[$prefix.$name] = $alias->withId($targetId);
232238
}
233239

234240
$this->routes = $prefixedRoutes;

‎src/Symfony/Component/Routing/Tests/Loader/Configurator/Traits/PrefixTraitTest.php‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Routing\Tests\Loader\Configurator\Traits;
13+
14+
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\Routing\Loader\Configurator\Traits\PrefixTrait;
16+
use Symfony\Component\Routing\Route;
17+
use Symfony\Component\Routing\RouteCollection;
18+
19+
class PrefixTraitTest extends TestCase
20+
{
21+
public function testAddLocalizedPrefixUpdatesAliases()
22+
{
23+
$collection = new RouteCollection();
24+
$collection->add('app_route', new Route('/path'));
25+
$collection->addAlias('app_alias', 'app_route');
26+
27+
$trait = new class {
28+
use PrefixTrait;
29+
30+
public function add(RouteCollection $c, array $p)
31+
{
32+
$this->addPrefix($c, $p, false);
33+
}
34+
};
35+
36+
$trait->add($collection, ['en' => '/en', 'fr' => '/fr']);
37+
38+
$this->assertNull($collection->get('app_route'));
39+
40+
$this->assertNotNull($collection->get('app_route.en'));
41+
$this->assertNotNull($collection->get('app_route.fr'));
42+
43+
$this->assertNull($collection->getAlias('app_alias'), 'The original alias should be removed as its target no longer exists');
44+
45+
$aliasEn = $collection->getAlias('app_alias.en');
46+
$this->assertNotNull($aliasEn, 'Localized alias for EN should exist');
47+
$this->assertEquals('app_route.en', $aliasEn->getId());
48+
49+
$aliasFr = $collection->getAlias('app_alias.fr');
50+
$this->assertNotNull($aliasFr, 'Localized alias for FR should exist');
51+
$this->assertEquals('app_route.fr', $aliasFr->getId());
52+
}
53+
}

‎src/Symfony/Component/Routing/Tests/Matcher/CompiledUrlMatcherTest.php‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,33 @@
1313

1414
use Symfony\Component\Routing\Matcher\CompiledUrlMatcher;
1515
use Symfony\Component\Routing\Matcher\Dumper\CompiledUrlMatcherDumper;
16+
use Symfony\Component\Routing\Matcher\UrlMatcher;
1617
use Symfony\Component\Routing\RequestContext;
18+
use Symfony\Component\Routing\Route;
1719
use Symfony\Component\Routing\RouteCollection;
1820

1921
class CompiledUrlMatcherTest extends UrlMatcherTest
2022
{
23+
public function testStaticHostIsCaseInsensitive()
24+
{
25+
$collection = new RouteCollection();
26+
$collection->add('static_host_route', new Route('/test', [], [], [], 'API.example.com'));
27+
28+
$context = new RequestContext('/test', 'GET', 'api.example.com');
29+
$matcher = new UrlMatcher($collection, $context);
30+
31+
$result = $matcher->match('/test');
32+
$this->assertEquals('static_host_route', $result['_route'], 'UrlMatcher should match case-insensitive host');
33+
34+
$dumper = new CompiledUrlMatcherDumper($collection);
35+
$compiledRoutes = $dumper->getCompiledRoutes();
36+
37+
$compiledMatcher = new CompiledUrlMatcher($compiledRoutes, $context);
38+
39+
$result = $compiledMatcher->match('/test');
40+
$this->assertEquals('static_host_route', $result['_route'], 'CompiledUrlMatcher should match case-insensitive host');
41+
}
42+
2143
protected function getUrlMatcher(RouteCollection $routes, ?RequestContext $context = null)
2244
{
2345
$dumper = new CompiledUrlMatcherDumper($routes);

‎src/Symfony/Component/Routing/Tests/RouteCollectionTest.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,4 +385,18 @@ public function testAddWithPriorityAndPrefix()
385385

386386
$this->assertSame($expected, $collection3->all());
387387
}
388+
389+
public function testAddNamePrefixDoesNotBreakExternalAliases()
390+
{
391+
$collection = new RouteCollection();
392+
$collection->add('local_route', new Route('/local'));
393+
$collection->addAlias('alias_to_local', 'local_route');
394+
$collection->addAlias('alias_to_external', 'external_route');
395+
$collection->addNamePrefix('prefix_');
396+
397+
$aliases = $collection->getAliases();
398+
399+
$this->assertEquals('prefix_local_route', $aliases['prefix_alias_to_local']->getId(), 'Alias to local route should have its target prefixed');
400+
$this->assertEquals('external_route', $aliases['prefix_alias_to_external']->getId(), 'Alias to external route should NOT have its target prefixed');
401+
}
388402
}

0 commit comments

Comments
 (0)