Fix parsing nullable collections

Fixes phpDocumentor#163.
Fixes phpDocumentor/phpDocumentor#3290.

Shorthand nullable type syntax is now supported for collection types
(e.g. `?array<int>`).

This also prevents a misuse of the shorthand nullable type syntax with
compound types, which is illegal with PHP types. This is documented in
the Union Types 2.0 RFC (https://wiki.php.net/rfc/union_types_v2) by
N. Popov:

> Union types and the ?T nullable type notation cannot be mixed.
> Writing ?T1|T2, T1|?T2 or ?(T1|T2) is not supported and T1|T2|null
> needs to be used instead.

Author: hemberger

src/TypeResolver.php

@@ -293,13 +293,8 @@ private function parseTypes(ArrayIterator $tokens, Context $context, int $parser
 
                 $tokens->next();
             } else {
-                $type = $this->resolveSingleType($token, $context);
+                $types[] = $this->resolveSingleType($token, $context);
                 $tokens->next();
-                if ($parserContext === self::PARSER_IN_NULLABLE) {
-                    return $type;
-                }
-
-                $types[] = $type;
             }
         }
 

tests/unit/CollectionResolverTest.php

@@ -328,4 +328,21 @@ public function testResolvingList(): void
         $this->assertInstanceOf(Types\String_::class, $valueType);
         $this->assertInstanceOf(Types\Integer::class, $keyType);
     }
+
+    /**
+     * @uses \phpDocumentor\Reflection\Types\Context
+     * @uses \phpDocumentor\Reflection\Types\Nullable
+     *
+     * @covers ::__construct
+     * @covers ::resolve
+     */
+    public function testResolvingNullableArray(): void
+    {
+        $fixture = new TypeResolver();
+
+        $resolvedType = $fixture->resolve('?array<int>', new Context(''));
+
+        $this->assertInstanceOf(Types\Nullable::class, $resolvedType);
+        $this->assertSame('?int[]', (string) $resolvedType);
+    }
 }

tests/unit/TypeResolverTest.php

@@ -407,9 +407,9 @@ public function testResolvingNullableCompoundTypes(): void
     {
         $fixture = new TypeResolver();
 
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Unexpected type separator');
         $resolvedType = $fixture->resolve('?string|null|?boolean');
-
-        $this->assertSame('?string|null|?bool', (string) $resolvedType);
     }
 
     /**