Fix #59 - Support IntersectionType (intersection types)

Ref: https://php.watch/versions/8.1/intersection-types

Author: williamdes

src/Parser/NodeVisitor.php

@@ -41,6 +41,7 @@
 use Doctum\Parser\Node\DocBlockNode;
 use PhpParser\Node\Stmt\PropertyProperty;
 use PhpParser\Node\UnionType;
+use PhpParser\Node\IntersectionType;
 
 class NodeVisitor extends NodeVisitorAbstract
 {
@@ -187,12 +188,12 @@ protected function addFunction(FunctionNode $node, ?string $namespace = null)
     }
 
     /**
-     * @param \PhpParser\Node\Identifier|\PhpParser\Node\Name|NullableType|UnionType|null $type Type declaration
+     * @param \PhpParser\Node\Identifier|\PhpParser\Node\Name|NullableType|UnionType|IntersectionType|null $type Type declaration
      */
     protected function typeToString($type): ?string
     {
         $typeString = null;
-        if ($type !== null && ! ($type instanceof NullableType || $type instanceof UnionType)) {
+        if ($type !== null && ! ($type instanceof NullableType || $type instanceof UnionType || $type instanceof IntersectionType)) {
             $typeString = $type->__toString();
         } elseif ($type instanceof NullableType) {
             $typeString = $type->type->__toString();
@@ -202,6 +203,12 @@ protected function typeToString($type): ?string
                 $typeString[] = $type->__toString();
             }
             $typeString = implode('|', $typeString);
+        } elseif ($type instanceof IntersectionType) {
+            $typeString = [];
+            foreach ($type->types as $type) {
+                $typeString[] = $type->__toString();
+            }
+            $typeString = implode('&', $typeString);
         }
 
         if ($typeString === null) {

tests/Parser/CodeParserTest.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types = 1);
+
+/*
+ * This file is part of the Doctum utility.
+ *
+ * (c) William Desportes <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Doctum\Tests\Parser;
+
+use Symfony\Component\Finder\Finder;
+use Doctum\Tests\AbstractTestCase;
+use Doctum\Doctum;
+
+class CodeParserTest extends AbstractTestCase
+{
+
+    public function testParseCode(): void
+    {
+        $dir      = __DIR__ . '/../phar/data';
+        $iterator = Finder::create()
+            ->files()
+            ->name('*.php')
+            ->in($dir . '/src');
+
+        $doctum = new Doctum(
+            $iterator,
+            [
+                'build_dir' => $dir . '/build',
+                'cache_dir' => $dir . '/cache',
+            ]
+        );
+
+        $codeParser = $this->callMethod($doctum, 'getCodeParser', []);
+        foreach ($iterator as $file) {
+            $fileContents = file_get_contents($file->getPathName());
+            $this->assertIsString($fileContents);
+            //echo 'parsing: ' . $file->getPathName() . PHP_EOL;
+            $codeParser->parse($fileContents);
+            //var_dump($codeParser->getContext()->getErrors());
+        }
+    }
+
+}

tests/phar/data/src/Intersection.php

@@ -0,0 +1,11 @@
+<?php
+
+class Foo {}
+interface Bar {}
+
+class Baz
+{
+    public function __construct(
+        public Foo&Bar $baz,
+    ) {}
+}

tests/phar/data/src/RoundaboutIntersection.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace RoundaboutIntersection;
+
+class FooAndBar extends Foo implements Bar {}
+
+class Baz
+{
+    public Foo&Bar $fooAndBar;
+
+    public function baz(Foo&Bar $baz)
+    {
+        return;
+    }
+
+    public function returnFooAndBar(): Foo&Bar
+    {
+        return new FooAndBar;
+    }
+}