Merge branch 'ignore-whitespaces' of https://github.com/popy-dev/TypeResolver into popy-dev-ignore-whitespaces

Author: jaapio

src/TypeResolver.php

@@ -108,9 +108,9 @@ public function resolve(string $type, Context $context = null): Type
             $context = new Context('');
         }
 
-        // split the type string into tokens `|`, `?`, `(`, `)[]`, '<', '>' and type names
+        // split the type string into tokens `|`, `?`, `<`, `>`, `,`, `(`, `)[]`, '<', '>' and type names
         $tokens = preg_split(
-            '/(\\||\\?|<|>|,|\\(|\\)(?:\\[\\])+)/',
+            '/(\\||\\?|<|>|, ?|\\(|\\)(?:\\[\\])+)/',
             $type,
             -1,
             PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE
@@ -206,7 +206,7 @@ private function parseTypes(\ArrayIterator $tokens, Context $context, $parserCon
 
                 $tokens->next();
             } elseif ($parserContext === self::PARSER_IN_COLLECTION_EXPRESSION
-                && ($token === '>' || $token === ',')
+                && ($token === '>' || trim($token) === ',')
                 ) {
                 break;
             } else {
@@ -411,7 +411,7 @@ private function resolveCollection(\ArrayIterator $tokens, Type $classType, Cont
         $valueType = $this->parseTypes($tokens, $context, self::PARSER_IN_COLLECTION_EXPRESSION);
         $keyType = null;
 
-        if ($tokens->current() === ',') {
+        if ($tokens->current() !== null && trim($tokens->current()) === ',') {
             // if we have a comma, then we just parsed the key type, not the value type
             $keyType = $valueType;
             if ($isArray) {

tests/unit/CollectionResolverTest.php

@@ -147,6 +147,54 @@ public function testResolvingArrayCollectionWithKey()
         $this->assertInstanceOf(Types\Compound::class, $valueType);
     }
 
+    /**
+     * @covers ::__construct
+     * @covers ::resolve
+     *
+     * @uses \phpDocumentor\Reflection\Types\Context
+     * @uses \phpDocumentor\Reflection\Types\Compound
+     * @uses \phpDocumentor\Reflection\Types\Collection
+     * @uses \phpDocumentor\Reflection\Types\String_
+     */
+    public function testResolvingArrayCollectionWithKeyAndWhitespace()
+    {
+        $fixture = new TypeResolver();
+
+        /** @var Collection $resolvedType */
+        $resolvedType = $fixture->resolve('array<string, object|array>', new Context(''));
+
+        $this->assertInstanceOf(Array_::class, $resolvedType);
+        $this->assertSame('array<string,object|array>', (string) $resolvedType);
+
+        /** @var Array_ $valueType */
+        $valueType = $resolvedType->getValueType();
+
+        /** @var Compound $keyType */
+        $keyType = $resolvedType->getKeyType();
+
+        $this->assertInstanceOf(Types\String_::class, $keyType);
+        $this->assertInstanceOf(Types\Compound::class, $valueType);
+    }
+
+    /**
+     * @covers ::__construct
+     * @covers ::resolve
+     * 
+     * @expectedException \InvalidArgumentException
+     *
+     * @uses \phpDocumentor\Reflection\Types\Context
+     * @uses \phpDocumentor\Reflection\Types\Compound
+     * @uses \phpDocumentor\Reflection\Types\Collection
+     * @uses \phpDocumentor\Reflection\Types\String_
+     */
+    public function testResolvingArrayCollectionWithKeyAndTooManyWhitespace()
+    {
+        $fixture = new TypeResolver();
+
+        /** @var Collection $resolvedType */
+        $resolvedType = $fixture->resolve('array<string,  object|array>', new Context(''));
+    }
+
     /**
      * @covers ::__construct
      * @covers ::resolve