[PropertyInfo] Support for the never return type

derrabus · derrabus · commit 091769a34954 · 2021-08-18T20:17:39.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/.github/patch-types.php b/.github/patch-types.php
@@ -42,6 +42,7 @@
         case false !== strpos($file, '/src/Symfony/Component/ErrorHandler/Tests/Fixtures/'):
         case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php'):
         case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php'):
+        case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php81Dummy.php'):
         case false !== strpos($file, '/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ObjectOuter.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/NotLoadableClass.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionIntersectionTypeFixture.php'):
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -335,7 +335,7 @@ 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 || 'mixed' === $phpTypeOrClass) {
+            if ('null' === $phpTypeOrClass || 'mixed' === $phpTypeOrClass || 'never' === $phpTypeOrClass) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -233,7 +233,7 @@ public function php71TypesProvider()
     }
 
     /**
-     *     * @dataProvider php80TypesProvider
+     * @dataProvider php80TypesProvider
      * @requires PHP 8
      */
     public function testExtractPhp80Type($property, array $type = null)
@@ -255,6 +255,14 @@ public function php80TypesProvider()
         ];
     }
 
+    /**
+     * @requires PHP 8.1
+     */
+    public function testExtractPhp81Type()
+    {
+        $this->assertNull($this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php81Dummy', 'nothing', []));
+    }
+
     /**
      * @dataProvider defaultValueProvider
      */
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php81Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php81Dummy.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+
+class Php81Dummy
+{
+    public function getNothing(): never
+    {
+        throw new \Exception('Oops');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ private function extractFromReflectionType(\ReflectionType $reflectionType, \Ref`
`335`	`335`
`336`	`336`	`foreach ($reflectionType instanceof \ReflectionUnionType ? $reflectionType->getTypes() : [$reflectionType] as $type) {`
`337`	`337`	`$phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : (string) $type;`
`338`		`- if ('null' === $phpTypeOrClass \|\| 'mixed' === $phpTypeOrClass) {`
	`338`	`+ if ('null' === $phpTypeOrClass \|\| 'mixed' === $phpTypeOrClass \|\| 'never' === $phpTypeOrClass) {`
`339`	`339`	`continue;`
`340`	`340`	`}`
`341`	`341`