Merge branch '4.4' into 5.0

* 4.4:
  fix test
  Added Unit tests for php 8 union types.

Author: nicolas-grekas

Extractor/ReflectionExtractor.php

@@ -326,12 +326,15 @@ private function extractFromReflectionType(\ReflectionType $reflectionType, \Ref
 
         foreach ($reflectionType instanceof \ReflectionUnionType ? $reflectionType->getTypes() : [$reflectionType] as $type) {
             $phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : (string) $type;
+            if ('null' === $phpTypeOrClass) {
+                continue;
+            }
 
             if (Type::BUILTIN_TYPE_ARRAY === $phpTypeOrClass) {
                 $types[] = new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true);
-            } elseif ('void' === $phpTypeOrClass || 'null' === $phpTypeOrClass) {
+            } elseif ('void' === $phpTypeOrClass) {
                 $types[] = new Type(Type::BUILTIN_TYPE_NULL, $nullable);
-            } elseif ($reflectionType->isBuiltin()) {
+            } elseif ($type->isBuiltin()) {
                 $types[] = new Type($phpTypeOrClass, $nullable);
             } else {
                 $types[] = new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $this->resolveTypeName($phpTypeOrClass, $reflectionMethod));

Tests/Extractor/ReflectionExtractorTest.php

@@ -219,6 +219,26 @@ public function php71TypesProvider()
         ];
     }
 
+    /**
+     *     * @dataProvider php80TypesProvider
+     * @requires PHP 8
+     */
+    public function testExtractPhp80Type($property, array $type = null)
+    {
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php80Dummy', $property, []));
+    }
+
+    public function php80TypesProvider()
+    {
+        return [
+            ['foo', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]],
+            ['bar', [new Type(Type::BUILTIN_TYPE_INT, true)]],
+            ['timeout', [new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_FLOAT)]],
+            ['optional', [new Type(Type::BUILTIN_TYPE_INT, true), new Type(Type::BUILTIN_TYPE_FLOAT, true)]],
+            ['string', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Stringable'), new Type(Type::BUILTIN_TYPE_STRING)]],
+        ];
+    }
+
     /**
      * @dataProvider defaultValueProvider
      */

Tests/Fixtures/Php80Dummy.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+
+class Php80Dummy
+{
+    public function getFoo(): array|null
+    {
+    }
+
+    public function setBar(int|null $bar)
+    {
+    }
+
+    public function setTimeout(int|float $timeout)
+    {
+    }
+
+    public function getOptional(): int|float|null
+    {
+    }
+
+    public function setString(string|\Stringable $string)
+    {
+    }
+}