From 2543091d4d7713a6f5e10781e1263e52620ff284 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 18 Jul 2022 13:31:46 +0200 Subject: [PATCH] Fail gracefully when attempting to autowire composite types --- .../LazyProxy/ProxyHelper.php | 16 +++++++ .../Tests/Compiler/AutowirePassTest.php | 44 +++++++++++++++++-- .../Fixtures/includes/autowiring_classes.php | 3 ++ .../includes/compositetype_classes.php | 21 +++++++++ 4 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/compositetype_classes.php diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php index 32b94df04bd95..46897efba2c1d 100644 --- a/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php +++ b/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php @@ -32,6 +32,11 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa return null; } + return self::getTypeHintForType($type, $r, $noBuiltin); + } + + private static function getTypeHintForType(\ReflectionType $type, \ReflectionFunctionAbstract $r, bool $noBuiltin): ?string + { $types = []; $glue = '|'; if ($type instanceof \ReflectionUnionType) { @@ -46,6 +51,17 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa } foreach ($reflectionTypes as $type) { + if ($type instanceof \ReflectionIntersectionType) { + $typeHint = self::getTypeHintForType($type, $r, $noBuiltin); + if (null === $typeHint) { + return null; + } + + $types[] = sprintf('(%s)', $typeHint); + + continue; + } + if ($type->isBuiltin()) { if (!$noBuiltin) { $types[] = $type->getName(); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php index 4e90bfb1c7a46..1cfc3f0889113 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php @@ -241,8 +241,6 @@ public function testTypeNotGuessableNoServicesFound() */ public function testTypeNotGuessableUnionType() { - $this->expectException(AutowiringFailedException::class); - $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\UnionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionA|Symfony\Component\DependencyInjection\Tests\Compiler\CollisionB" but this class was not found.'); $container = new ContainerBuilder(); $container->register(CollisionA::class); @@ -252,6 +250,9 @@ public function testTypeNotGuessableUnionType() $aDefinition->setAutowired(true); $pass = new AutowirePass(); + + $this->expectException(AutowiringFailedException::class); + $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\UnionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionA|Symfony\Component\DependencyInjection\Tests\Compiler\CollisionB" but this class was not found.'); $pass->process($container); } @@ -260,17 +261,38 @@ public function testTypeNotGuessableUnionType() */ public function testTypeNotGuessableIntersectionType() { + $container = new ContainerBuilder(); + + $container->register(CollisionInterface::class); + $container->register(AnotherInterface::class); + + $aDefinition = $container->register('a', IntersectionClasses::class); + $aDefinition->setAutowired(true); + + $pass = new AutowirePass(); + $this->expectException(AutowiringFailedException::class); $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\IntersectionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface&Symfony\Component\DependencyInjection\Tests\Compiler\AnotherInterface" but this class was not found.'); + $pass->process($container); + } + + /** + * @requires PHP 8.2 + */ + public function testTypeNotGuessableCompositeType() + { $container = new ContainerBuilder(); $container->register(CollisionInterface::class); $container->register(AnotherInterface::class); - $aDefinition = $container->register('a', IntersectionClasses::class); + $aDefinition = $container->register('a', CompositeTypeClasses::class); $aDefinition->setAutowired(true); $pass = new AutowirePass(); + + $this->expectException(AutowiringFailedException::class); + $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CompositeTypeClasses::__construct()" has type "(Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface&Symfony\Component\DependencyInjection\Tests\Compiler\AnotherInterface)|Symfony\Component\DependencyInjection\Tests\Compiler\YetAnotherInterface" but this class was not found.'); $pass->process($container); } @@ -373,6 +395,22 @@ public function testParameterWithNullUnionIsSkipped() $this->assertNull($definition->getArgument(0)); } + /** + * @requires PHP 8.2 + */ + public function testParameterWithNullableIntersectionIsSkipped() + { + $container = new ContainerBuilder(); + + $optDefinition = $container->register('opt', NullableIntersection::class); + $optDefinition->setAutowired(true); + + (new AutowirePass())->process($container); + + $definition = $container->getDefinition('opt'); + $this->assertNull($definition->getArgument(0)); + } + /** * @requires PHP 8 */ diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php index 74b976e224dd8..a3bdd82ff8496 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php @@ -10,6 +10,9 @@ if (\PHP_VERSION_ID >= 80100) { require __DIR__.'/intersectiontype_classes.php'; } +if (\PHP_VERSION_ID >= 80200) { + require __DIR__.'/compositetype_classes.php'; +} class Foo { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/compositetype_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/compositetype_classes.php new file mode 100644 index 0000000000000..d0de7432fc4cf --- /dev/null +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/compositetype_classes.php @@ -0,0 +1,21 @@ +