Remove legacy nullable format

Compound types containg `?` nullables are deprecated in php, and
not supported by phpstan. In v1 we had a work around for this but
this was slow and fragile. The nullable format has been deprecated
since 2023 and is now removed. We still produce a deprecation error
to warn people about invalid type handling.

fixes #184

Author: jaapio

src/TypeResolver.php

@@ -199,14 +199,8 @@ final class TypeResolver
     public function __construct(?FqsenResolver $fqsenResolver = null)
     {
         $this->fqsenResolver = $fqsenResolver ?: new FqsenResolver();
-
-        if (class_exists(ParserConfig::class)) {
-            $this->typeParser = new TypeParser(new ParserConfig([]), new ConstExprParser(new ParserConfig([])));
-            $this->lexer = new Lexer(new ParserConfig([]));
-        } else {
-            $this->typeParser = new TypeParser(new ConstExprParser());
-            $this->lexer = new Lexer();
-        }
+        $this->typeParser = new TypeParser(new ParserConfig([]), new ConstExprParser(new ParserConfig([])));
+        $this->lexer = new Lexer(new ParserConfig([]));
     }
 
     /**
@@ -242,7 +236,19 @@ public function resolve(string $type, ?Context $context = null): Type
         $ast = $this->parse($tokenIterator);
         $type = $this->createType($ast, $context);
 
-        return $this->tryParseRemainingCompoundTypes($tokenIterator, $context, $type);
+        if (
+            $tokenIterator->isCurrentTokenType(Lexer::TOKEN_UNION) ||
+            $tokenIterator->isCurrentTokenType(Lexer::TOKEN_INTERSECTION)
+        ) {
+            Deprecation::trigger(
+                'phpdocumentor/type-resolver',
+                'https://github.com/phpDocumentor/TypeResolver/issues/184',
+                'Legacy nullable type detected, please update your code as
+                you are using nullable types in a docblock. support is removed in v2.0.0'
+            );
+        }
+
+        return $type;
     }
 
     public function createType(?TypeNode $type, Context $context): Type
@@ -678,47 +684,6 @@ private function parse(TokenIterator $tokenIterator): TypeNode
         return $ast;
     }
 
-    /**
-     * Will try to parse unsupported type notations by phpstan
-     *
-     * The phpstan parser doesn't support the illegal nullable combinations like this library does.
-     * This method will warn the user about those notations but for bc purposes we will still have it here.
-     */
-    private function tryParseRemainingCompoundTypes(TokenIterator $tokenIterator, Context $context, Type $type): Type
-    {
-        if (
-            $tokenIterator->isCurrentTokenType(Lexer::TOKEN_UNION) ||
-            $tokenIterator->isCurrentTokenType(Lexer::TOKEN_INTERSECTION)
-        ) {
-            Deprecation::trigger(
-                'phpdocumentor/type-resolver',
-                'https://github.com/phpDocumentor/TypeResolver/issues/184',
-                'Legacy nullable type detected, please update your code as
-                you are using nullable types in a docblock. support will be removed in v2.0.0'
-            );
-        }
-
-        $continue = true;
-        while ($continue) {
-            $continue = false;
-            while ($tokenIterator->tryConsumeTokenType(Lexer::TOKEN_UNION)) {
-                $ast = $this->parse($tokenIterator);
-                $type2 = $this->createType($ast, $context);
-                $type = new Compound([$type, $type2]);
-                $continue = true;
-            }
-
-            while ($tokenIterator->tryConsumeTokenType(Lexer::TOKEN_INTERSECTION)) {
-                $ast = $this->typeParser->parse($tokenIterator);
-                $type2 = $this->createType($ast, $context);
-                $type = new Intersection([$type, $type2]);
-                $continue = true;
-            }
-        }
-
-        return $type;
-    }
-
     /**
      * @param TypeNode[] $nodes
      *

tests/unit/TypeResolverTest.php

@@ -895,16 +895,28 @@ public function testArrayKeyValueSpecification(): void
      * @dataProvider callableProvider
      * @dataProvider constExpressions
      * @dataProvider shapeStructures
-     * @dataProvider illegalLegacyFormatProvider
      * @testdox create type from $type
      */
     public function testTypeBuilding(string $type, Type $expected, bool $deprecation = false): void
     {
-        if ($deprecation) {
-            $this->expectDeprecationWithIdentifier('https://github.com/phpDocumentor/TypeResolver/issues/184');
-        } else {
-            $this->expectNoDeprecationWithIdentifier('https://github.com/phpDocumentor/TypeResolver/issues/184');
-        }
+        $this->expectNoDeprecationWithIdentifier('https://github.com/phpDocumentor/TypeResolver/issues/184');
+
+        $fixture = new TypeResolver();
+        $actual = $fixture->resolve($type, new Context('phpDocumentor'));
+
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * @covers ::__construct
+     * @covers ::resolve
+     * @covers ::createType
+     * @dataProvider illegalLegacyFormatProvider
+     * @testdox create type from $type
+     */
+    public function testTypeBuildingThrowsError(string $type, Type $expected): void
+    {
+        $this->expectDeprecationWithIdentifier('https://github.com/phpDocumentor/TypeResolver/issues/184');
 
         $fixture = new TypeResolver();
         $actual = $fixture->resolve($type, new Context('phpDocumentor'));
@@ -1359,52 +1371,31 @@ public function illegalLegacyFormatProvider(): array
         return [
             [
                 '?string |bool',
-                new Compound([new Nullable(new String_()), new Boolean()]),
-                true,
+                new Nullable(new String_()),
             ],
             [
                 '?string|?bool',
-                new Compound([new Nullable(new String_()), new Nullable(new Boolean())]),
-                true,
+                new Nullable(new String_()),
             ],
             [
                 '?string|?bool|null',
-                new Compound([new Nullable(new String_()), new Nullable(new Boolean()), new Null_()]),
-                true,
+                new Nullable(new String_()),
             ],
             [
                 '?string|bool|Foo',
-                new Compound([
-                    new Nullable(new String_()),
-                    new Boolean(),
-                    new Object_(new Fqsen('\\phpDocumentor\\Foo')),
-                ]),
-                true,
+                new Nullable(new String_()),
             ],
             [
                 '?string&bool',
-                new Intersection([new Nullable(new String_()), new Boolean()]),
-                true,
+                new Nullable(new String_()),
             ],
             [
                 '?string&bool|Foo',
-                new Intersection(
-                    [
-                        new Nullable(new String_()),
-                        new Compound([new Boolean(), new Object_(new Fqsen('\\phpDocumentor\\Foo'))]),
-                    ]
-                ),
-                true,
+                new Nullable(new String_()),
             ],
             [
                 '?string&?bool|null',
-                new Compound(
-                    [
-                        new Intersection([new Nullable(new String_()), new Nullable(new Boolean())]),
-                        new Null_(),
-                    ]
-                ),
-                true,
+                new Nullable(new String_()),
             ],
         ];
     }