Expect an instanceof ReflectionNamedType

`^8.0` marks `ReflectionType` abstract and moves `isBuiltin` to `ReflectionNamedType` Signed-off-by: George Steel <[email protected]>
laminas · Oct 10, 2022 · fa2ec24 · fa2ec24
1 parent 00a257d
commit fa2ec24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Tool/ConfigDumper.php b/src/Tool/ConfigDumper.php
@@ -8,6 +8,7 @@
 use Laminas\ServiceManager\Exception\InvalidArgumentException;
 use Psr\Container\ContainerInterface;
 use ReflectionClass;
+use ReflectionNamedType;
 use ReflectionParameter;
 use Traversable;
 
@@ -83,7 +84,7 @@ public function createDependencyConfig(array $config, $className, $ignoreUnresol
 
         foreach ($constructorArguments as $constructorArgument) {
             $type         = $constructorArgument->getType();
-            $argumentType = null !== $type && ! $type->isBuiltin() ? $type->getName() : null;
+            $argumentType = $type instanceof ReflectionNamedType && ! $type->isBuiltin() ? $type->getName() : null;
 
             if ($argumentType === null) {
                 if ($ignoreUnresolved) {

diff --git a/src/Tool/FactoryCreator.php b/src/Tool/FactoryCreator.php
@@ -8,6 +8,7 @@
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerInterface;
 use ReflectionClass;
+use ReflectionNamedType;
 use ReflectionParameter;
 
 use function array_filter;
@@ -105,7 +106,7 @@ function (ReflectionParameter $argument): bool {
                 }
 
                 $type  = $argument->getType();
-                $class = null !== $type && ! $type->isBuiltin() ? $type->getName() : null;
+                $class = $type instanceof ReflectionNamedType && ! $type->isBuiltin() ? $type->getName() : null;
 
                 if (null === $class) {
                     throw new InvalidArgumentException(sprintf(
@@ -125,7 +126,7 @@ function (ReflectionParameter $argument): bool {
 
         return array_map(function (ReflectionParameter $parameter): ?string {
             $type = $parameter->getType();
-            return null !== $type && ! $type->isBuiltin() ? $type->getName() : null;
+            return $type instanceof ReflectionNamedType && ! $type->isBuiltin() ? $type->getName() : null;
         }, $constructorParameters);
     }