Skip to content

[DependencyInjection] Fix state corruption in PhpFileLoader during recursive imports #62523

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
fabpot merged 1 commit into from
Nov 29, 2025
+40 −1
Merged

[DependencyInjection] Fix state corruption in PhpFileLoader during recursive imports #62523

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,17 @@ public function load(mixed $resource, ?string $type = null): mixed
return include $path;
}, $this, ProtectedPhpFileLoader::class);

$instanceof = $this->instanceof;
$this->instanceof = [];

try {
$callback = $load($path, $this->env);

if (\is_object($callback) && \is_callable($callback)) {
$this->executeCallback($callback, new ContainerConfigurator($this->container, $this, $this->instanceof, $path, $resource, $this->env), $path);
}
} finally {
$this->instanceof = [];
$this->instanceof = $instanceof;
$this->registerAliasesForSinglyImplementedInterfaces();
}

Expand Down
5 changes: 5 additions & 0 deletions src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof_import_child.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return function (ContainerConfigurator $container) {};
17 changes: 17 additions & 0 deletions src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof_import_parent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;

return function (ContainerConfigurator $container, PhpFileLoader $loader) {
$services = $container->services();

$services->instanceof(\stdClass::class)->tag('foo_tag');

$services->set('service_before', \stdClass::class);

$loader->import('instanceof_import_child.php');

$services->set('service_after', \stdClass::class);
};
14 changes: 14 additions & 0 deletions src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,18 @@ public function testServiceWithServiceLocatorArgument()
$values = ['foo' => new Definition(\stdClass::class), 'bar' => new Definition(\stdClass::class)];
$this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_inline_service')->getArguments());
}

public function testInstanceofStateIsRestoredAfterImport()
{
$container = new ContainerBuilder();

$loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'));
$loader->load('instanceof_import_parent.php');

$conditionalsBefore = $container->getDefinition('service_before')->getInstanceofConditionals();
$this->assertArrayHasKey(\stdClass::class, $conditionalsBefore, 'Pre-import definition missing instanceof rule.');

$conditionalsAfter = $container->getDefinition('service_after')->getInstanceofConditionals();
$this->assertArrayHasKey(\stdClass::class, $conditionalsAfter, 'Post-import definition missing instanceof rule (State corruption detected).');
}
}
Loading