Merge pull request #6 from Ocramius/hotfix/multiple-compound-array-types

Hotfix: multiple compound array types

Author: mvriel

src/TypeResolver.php

@@ -104,10 +104,10 @@ public function resolve($type, Context $context = null)
                 return $this->resolveKeyword($type);
             case ($this->isCompoundType($type)):
                 return $this->resolveCompoundType($type, $context);
-            case $this->isFqsen($type):
-                return $this->resolveTypedObject($type);
             case $this->isTypedArray($type):
                 return $this->resolveTypedArray($type, $context);
+            case $this->isFqsen($type):
+                return $this->resolveTypedObject($type);
             case $this->isPartialStructuralElementName($type):
                 return $this->resolveTypedObject($type, $context);
             // @codeCoverageIgnoreStart

tests/unit/TypeResolverTest.php

@@ -204,6 +204,40 @@ public function testResolvingCompoundTypes()
         $this->assertInstanceOf('phpDocumentor\Reflection\Fqsen', $secondType->getFqsen());
     }
 
+    /**
+     * @covers ::__construct
+     * @covers ::resolve
+     * @covers ::<private>
+     *
+     * @uses phpDocumentor\Reflection\Types\Context
+     * @uses phpDocumentor\Reflection\Types\Compound
+     * @uses phpDocumentor\Reflection\Types\Array_
+     * @uses phpDocumentor\Reflection\Types\Object_
+     * @uses phpDocumentor\Reflection\Fqsen
+     * @uses phpDocumentor\Reflection\FqsenResolver
+     */
+    public function testResolvingCompoundTypedArrayTypes()
+    {
+        $fixture = new TypeResolver();
+
+        /** @var Compound $resolvedType */
+        $resolvedType = $fixture->resolve('\stdClass[]|Reflection\DocBlock[]', new Context('phpDocumentor'));
+
+        $this->assertInstanceOf('phpDocumentor\Reflection\Types\Compound', $resolvedType);
+        $this->assertSame('\stdClass[]|\phpDocumentor\Reflection\DocBlock[]', (string)$resolvedType);
+
+        /** @var Array_ $secondType */
+        $firstType = $resolvedType->get(0);
+
+        /** @var Array_ $secondType */
+        $secondType = $resolvedType->get(1);
+
+        $this->assertInstanceOf('phpDocumentor\Reflection\Types\Array_', $firstType);
+        $this->assertInstanceOf('phpDocumentor\Reflection\Types\Array_', $secondType);
+        $this->assertInstanceOf('phpDocumentor\Reflection\Types\Object_', $firstType->getValueType());
+        $this->assertInstanceOf('phpDocumentor\Reflection\Types\Object_', $secondType->getValueType());
+    }
+
     /**
      * This test asserts that the parameter order is correct.
      *