Fix support for PHP8 union types

nicolas-grekas · nicolas-grekas · commit dd1b61703fae · 2020-06-18T20:40:13.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -112,7 +112,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                 throw new \LogicException(sprintf('"%s" uses "%s", but does not implement the required method "protected function configureContainer(ContainerConfigurator $c): void".', get_debug_type($this), MicroKernelTrait::class), 0, $e);
             }
 
-            $configuratorClass = $configureContainer->getNumberOfParameters() > 0 && ($type = $configureContainer->getParameters()[0]->getType()) && !$type->isBuiltin() ? $type->getName() : null;
+            $configuratorClass = $configureContainer->getNumberOfParameters() > 0 && ($type = $configureContainer->getParameters()[0]->getType()) instanceof \ReflectionNamedType && !$type->isBuiltin() ? $type->getName() : null;
 
             if ($configuratorClass && !is_a(ContainerConfigurator::class, $configuratorClass, true)) {
                 $this->configureContainer($container, $loader);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredPropertiesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredPropertiesPass.php
@@ -42,7 +42,7 @@ protected function processValue($value, bool $isRoot = false)
 
         $properties = $value->getProperties();
         foreach ($reflectionClass->getProperties() as $reflectionProperty) {
-            if (!$reflectionProperty->hasType()) {
+            if (!($type = $reflectionProperty->getType()) instanceof \ReflectionNamedType) {
                 continue;
             }
             if (false === $doc = $reflectionProperty->getDocComment()) {
@@ -55,7 +55,7 @@ protected function processValue($value, bool $isRoot = false)
                 continue;
             }
 
-            $type = $reflectionProperty->getType()->getName();
+            $type = $type->getName();
             $value->setProperty($name, new TypedReference($type, $type, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, $name));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)`
`112`	`112`	`throw new \LogicException(sprintf('"%s" uses "%s", but does not implement the required method "protected function configureContainer(ContainerConfigurator $c): void".', get_debug_type($this), MicroKernelTrait::class), 0, $e);`
`113`	`113`	`}`
`114`	`114`
`115`		`- $configuratorClass = $configureContainer->getNumberOfParameters() > 0 && ($type = $configureContainer->getParameters()[0]->getType()) && !$type->isBuiltin() ? $type->getName() : null;`
	`115`	`+ $configuratorClass = $configureContainer->getNumberOfParameters() > 0 && ($type = $configureContainer->getParameters()[0]->getType()) instanceof \ReflectionNamedType && !$type->isBuiltin() ? $type->getName() : null;`
`116`	`116`
`117`	`117`	`if ($configuratorClass && !is_a(ContainerConfigurator::class, $configuratorClass, true)) {`
`118`	`118`	`$this->configureContainer($container, $loader);`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ protected function processValue($value, bool $isRoot = false)`
`42`	`42`
`43`	`43`	`$properties = $value->getProperties();`
`44`	`44`	`foreach ($reflectionClass->getProperties() as $reflectionProperty) {`
`45`		`- if (!$reflectionProperty->hasType()) {`
	`45`	`+ if (!($type = $reflectionProperty->getType()) instanceof \ReflectionNamedType) {`
`46`	`46`	`continue;`
`47`	`47`	`}`
`48`	`48`	`if (false === $doc = $reflectionProperty->getDocComment()) {`
`@@ -55,7 +55,7 @@ protected function processValue($value, bool $isRoot = false)`
`55`	`55`	`continue;`
`56`	`56`	`}`
`57`	`57`
`58`		`- $type = $reflectionProperty->getType()->getName();`
	`58`	`+ $type = $type->getName();`
`59`	`59`	`$value->setProperty($name, new TypedReference($type, $type, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, $name));`
`60`	`60`	`}`
`61`	`61`