Closes sebastianbergmann#981

Author: sebastianbergmann

ChangeLog.md

@@ -2,6 +2,12 @@
 
 All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [10.0.1] - 2023-MM-DD
+
+### Fixed
+
+* [#981](https://github.com/sebastianbergmann/php-code-coverage/issues/981): `CodeUnitFindingVisitor` does not support DNF types
+
 ## [10.0.0] - 2023-02-03
 
 ### Added
@@ -482,6 +488,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 * This component is no longer supported on PHP 7.1
 
+[10.0.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.0.0...10.0.1
 [10.0.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.24...10.0.0
 [9.2.24]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.23...9.2.24
 [9.2.24]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.23...9.2.24

src/StaticAnalysis/CodeUnitFindingVisitor.php

@@ -165,8 +165,12 @@ private function type(Identifier|Name|ComplexType $type): string
             return '?' . $type->type;
         }
 
-        if ($type instanceof UnionType || $type instanceof IntersectionType) {
-            return $this->unionOrIntersectionAsString($type);
+        if ($type instanceof UnionType) {
+            return $this->unionTypeAsString($type);
+        }
+
+        if ($type instanceof IntersectionType) {
+            return $this->intersectionTypeAsString($type);
         }
 
         return $type->toString();
@@ -283,29 +287,40 @@ private function namespace(string $namespacedName, string $name): string
         return trim(rtrim($namespacedName, $name), '\\');
     }
 
-    /**
-     * @psalm-param UnionType|IntersectionType $type
-     */
-    private function unionOrIntersectionAsString(ComplexType $type): string
+    private function unionTypeAsString(UnionType $node): string
     {
-        if ($type instanceof UnionType) {
-            $separator = '|';
-        } else {
-            $separator = '&';
+        $types = [];
+
+        foreach ($node->types as $type) {
+            if ($type instanceof IntersectionType) {
+                $types[] = '(' . $this->intersectionTypeAsString($type) . ')';
+
+                continue;
+            }
+
+            $types[] = $this->typeAsString($type);
         }
 
+        return implode('|', $types);
+    }
+
+    private function intersectionTypeAsString(IntersectionType $node): string
+    {
         $types = [];
 
-        foreach ($type->types as $_type) {
-            if ($_type instanceof Name) {
-                $types[] = $_type->toCodeString();
-            } else {
-                assert($_type instanceof Identifier);
+        foreach ($node->types as $type) {
+            $types[] = $this->typeAsString($type);
+        }
 
-                $types[] = $_type->toString();
-            }
+        return implode('&', $types);
+    }
+
+    private function typeAsString(Identifier|Name $node): string
+    {
+        if ($node instanceof Name) {
+            return $node->toCodeString();
         }
 
-        return implode($separator, $types);
+        return $node->toString();
     }
 }

tests/_files/FunctionWithDisjunctiveNormalFormTypes.php

@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+namespace SebastianBergmann\CodeCoverage\TestFixture;
+
+interface A
+{
+}
+
+interface B
+{
+}
+
+interface C
+{
+}
+
+interface D
+{
+}
+
+interface X
+{
+}
+
+function f((A&B)|D $x): void
+{
+}
+
+function g(C|(X&D)|null $x): void
+{
+}
+
+function h((A&B&D)|int|null $x): void
+{
+}

tests/tests/StaticAnalysis/CodeUnitFindingVisitorTest.php

@@ -115,6 +115,33 @@ public function testHandlesFunctionOrMethodWithIntersectionTypes(): void
         );
     }
 
+    public function testHandlesFunctionOrMethodWithDisjunctiveNormalFormTypes(): void
+    {
+        $codeUnitFindingVisitor = $this->findCodeUnits(__DIR__ . '/../../_files/FunctionWithDisjunctiveNormalFormTypes.php');
+
+        $this->assertEmpty($codeUnitFindingVisitor->classes());
+        $this->assertEmpty($codeUnitFindingVisitor->traits());
+
+        $functions = $codeUnitFindingVisitor->functions();
+
+        $this->assertCount(3, $functions);
+
+        $this->assertSame(
+            'f((\SebastianBergmann\CodeCoverage\TestFixture\A&\SebastianBergmann\CodeCoverage\TestFixture\B)|\SebastianBergmann\CodeCoverage\TestFixture\D $x): void',
+            $functions['SebastianBergmann\CodeCoverage\TestFixture\f']['signature']
+        );
+
+        $this->assertSame(
+            'g(\SebastianBergmann\CodeCoverage\TestFixture\C|(\SebastianBergmann\CodeCoverage\TestFixture\X&\SebastianBergmann\CodeCoverage\TestFixture\D)|null $x): void',
+            $functions['SebastianBergmann\CodeCoverage\TestFixture\g']['signature']
+        );
+
+        $this->assertSame(
+            'h((\SebastianBergmann\CodeCoverage\TestFixture\A&\SebastianBergmann\CodeCoverage\TestFixture\B&\SebastianBergmann\CodeCoverage\TestFixture\D)|int|null $x): void',
+            $functions['SebastianBergmann\CodeCoverage\TestFixture\h']['signature']
+        );
+    }
+
     private function findCodeUnits(string $filename): CodeUnitFindingVisitor
     {
         $nodes = (new ParserFactory)->create(ParserFactory::PREFER_PHP7)->parse(