8000 [DependencyInjection] Fix regression in ordering service locators by priority by longwave · Pull Request #57345 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DependencyInjection] Fix regression in ordering service locators by priority #57345

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

Merged
merged 7 commits into from
Jun 28, 2024
Merged

[DependencyInjection] Fix regression in ordering service locators by priority #57345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0a7477d
Test convert CompletionInput into string
seriquynh Jun 28, 2024
c3bf9a6
[Filesystem][Mime] Fix transient tests
nicolas-grekas Jun 28, 2024
7beff57
minor #57570 [Console] Test convert CompletionInput into string (seri…
nicolas-grekas Jun 28, 2024
fd32ec5
minor #57575 [Filesystem][Mime] Fix transient tests (nicolas-grekas)
nicolas-grekas Jun 28, 2024
68eaede
Merge branch '5.4' into 6.4
nicolas-grekas Jun 28, 2024
b6ec960
Merge branch '6.4' into 7.0
nicolas-grekas Jun 28, 2024
d4b812c
Allow service locators to be ordered by priority.
longwave Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Component/Console/Completion/CompletionInput.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static function fromString(string $inputStr, int $currentIndex): self
* Create an input based on an COMP_WORDS token list.
*
* @param string[] $tokens the set of split tokens (e.g. COMP_WORDS or argv)
* @param $currentIndex the index of the cursor (e.g. COMP_CWORD)
* @param int $currentIndex the index of the cursor (e.g. COMP_CWORD)
*/
public static function fromTokens(array $tokens, int $currentIndex): self
{
Expand Down
15 changes: 15 additions & 0 deletions src/Symfony/Component/Console/Tests/Completion/CompletionInputTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,19 @@ public static function provideFromStringData()
yield ['bin/console cache:clear "multi word string"', ['bin/console', 'cache:clear', '"multi word string"']];
yield ['bin/console cache:clear \'multi word string\'', ['bin/console', 'cache:clear', '\'multi word string\'']];
}

public function testToString()
{
$input = CompletionInput::fromTokens(['foo', 'bar', 'baz'], 0);
$this->assertSame('foo| bar baz', (string) $input);

$input = CompletionInput::fromTokens(['foo', 'bar', 'baz'], 1);
$this->assertSame('foo bar| baz', (string) $input);

$input = CompletionInput::fromTokens(['foo', 'bar', 'baz'], 2);
$this->assertSame('foo bar baz|', (string) $input);

$input = CompletionInput::fromTokens(['foo', 'bar', 'baz'], 11);
$this->assertSame('foo bar baz |', (string) $input);
}
}
1 change: 0 additions & 1 deletion src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ public static function map(array $services): array

$services[$k] = new ServiceClosureArgument($v);
}
ksort($services);
return $services;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ public function testTaggedLocatorWithDefaultPriorityMethodConfiguredViaAttribute
// We need to check priority of instances in the factories
$factories = (new \ReflectionClass($locator))->getProperty('factories');

self::assertSame([BarTagClass::class, FooTagClass::class], array_keys($factories->getValue($locator)));
self::assertSame([FooTagClass::class, BarTagClass::class], array_keys($factories->getValue($locator)));
}

public function testTaggedLocatorWithDefaultIndexMethodAndWithDefaultPriorityMethodConfiguredViaAttribute()
Expand Down Expand Up @@ -652,7 +652,7 @@ public function testTaggedLocatorWithDefaultIndexMethodAndWithDefaultPriorityMet
// We need to check priority of instances in the factories
$factories = (new \ReflectionClass($locator))->getProperty('factories');

self::assertSame(['bar_tag_class', 'foo_tag_class'], array_keys($factories->getValue($locator)));
self::assertSame(['foo_tag_class', 'bar_tag_class'], array_keys($factories->getValue($locator)));
self::assertSame($container->get(BarTagClass::class), $locator->get('bar_tag_class'));
self::assertSame($container->get(FooTagClass::class), $locator->get('foo_tag_class'));
}
Expand Down
2 changes: 1 addition & 1 deletion ...mfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ public static function getSubscribedServices(): array
'autowired' => new ServiceClosureArgument(new TypedReference('service.id', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'autowired', [new Autowire(service: 'service.id')])),
'autowired.nullable' => new ServiceClosureArgument(new TypedReference('service.id', 'stdClass', ContainerInterface::IGNORE_ON_INVALID_REFERENCE, 'autowired.nullable', [new Autowire(service: 'service.id')])),
'autowired.parameter' => new ServiceClosureArgument('foobar'),
'autowire.decorated' => new ServiceClosureArgument(new Reference('.service_locator.oO4rxCy.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
'autowire.decorated' => new ServiceClosureArgument(new Reference('.service_locator.0tSxobl.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'target', [new Target('someTarget')])),
];
$this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public function testDefinitionOrderIsTheSame()
$locator = $container->getDefinition($locator);
$factories = $locator->getArguments()[0];

static::assertSame(['service-1', 'service-2'], array_keys($factories));
static::assertSame(['service-2', 'service-1'], array_keys($factories));
}

public function testBindingsAreProcessed()
Expand Down
10 changes: 5 additions & 5 deletions src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ public function isCompiled(): bool
public function getRemovedIds(): array
{
return [
'.service_locator.2hyyc9y' => true,
'.service_locator.KGUGnmw' => true,
'.service_locator.KGUGnmw.foo_service' => true,
'.service_locator.0H1ht0q' => true,
'.service_locator.0H1ht0q.foo_service' => true,
'.service_locator.tfSHZa1' => true,
'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => true,
];
}
Expand All @@ -68,14 +68,14 @@ protected static function getTestServiceSubscriberService($container)
protected static function getFooServiceService($container)
{
return $container->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber((new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService ??= $container->getService(...), [
'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => ['privates', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition', 'getCustomDefinitionService', false],
'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => ['services', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber', 'getTestServiceSubscriberService', false],
'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => ['privates', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition', 'getCustomDefinitionService', false],
'bar' => ['services', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber', 'getTestServiceSubscriberService', false],
'baz' => ['privates', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition', 'getCustomDefinitionService', false],
'late_alias' => ['services', 'late_alias', 'getLateAliasService', false],
], [
'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber',
'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
'bar' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
'baz' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
'late_alias' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestDefinition1',
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,17 +171,17 @@ public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
}

$finder = new PhpExecutableFinder();
$process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', 'localhost:8057']));
$process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', 'localhost:8857']));
$process->setWorkingDirectory(__DIR__.'/Fixtures/web');

$process->start();

do {
usleep(50000);
} while (!@fopen('http://localhost:8057', 'r'));
} while (!@fopen('http://localhost:8857', 'r'));

try {
$sourceFilePath = 'http://localhost:8057/logo_symfony_header.png';
$sourceFilePath = 'http://localhost:8857/logo_symfony_header.png';
$targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
file_put_contents($targetFilePath, 'TARGET FILE');
$this->filesystem->copy($sourceFilePath, $targetFilePath, false);
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Mime/Tests/Part/DataPartTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ public function testFromPathWithUrl()
}

$finder = new PhpExecutableFinder();
$process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', 'localhost:8057']));
$process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', 'localhost:8856']));
$process->setWorkingDirectory(__DIR__.'/../Fixtures/web');
$process->start();

try {
do {
usleep(50000);
} while (!@fopen('http://localhost:8057', 'r'));
$p = DataPart::fromPath($file = 'http://localhost:8057/logo_symfony_header.png');
} while (!@fopen('http://localhost:8856', 'r'));
$p = DataPart::fromPath($file = 'http://localhost:8856/logo_symfony_header.png');
$content = file_get_contents($file);
$this->assertEquals($content, $p->getBody());
$maxLineLength = 76;
Expand Down
0