Some fixes

Author: Big-Shark

src/TypeResolver.php

@@ -208,14 +208,8 @@ private function parseTypes(ArrayIterator $tokens, Context $context, int $parser
                 }
 
                 $tokens->next();
-                $token = $tokens->current();
 
-                if ($token === self::OPERATOR_ARRAY) {
-                    $tokens->next();
-                    $resolvedType = new Array_($type);
-                } else {
-                    $resolvedType = new Expression_($type);
-                }
+                $resolvedType = new Expression_($type);
 
                 $types[] = $resolvedType;
             } elseif ($parserContext === self::PARSER_IN_ARRAY_EXPRESSION && $token[0] === ')') {
@@ -242,8 +236,13 @@ private function parseTypes(ArrayIterator $tokens, Context $context, int $parser
             ) {
                 break;
             } elseif ($token === self::OPERATOR_ARRAY) {
-                $last = array_key_last($types);
-                $types[$last] = new Array_($types[$last]);
+                end($types);
+                $last = key($types);
+                $lastItem = $types[$last];
+                if ($lastItem instanceof Expression_) {
+                    $lastItem = $lastItem->getValueType();
+                }
+                $types[$last] = new Array_($lastItem);
 
                 $tokens->next();
             } else {

src/Types/AbstractList.php

@@ -58,4 +58,24 @@ public function getValueType() : Type
     {
         return $this->valueType;
     }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString() : string
+    {
+        if ($this->keyType) {
+            return 'array<' . $this->keyType . ',' . $this->valueType . '>';
+        }
+
+        if ($this->valueType instanceof Mixed_) {
+            return 'array';
+        }
+
+        if ($this->valueType instanceof Compound) {
+            return '(' . $this->valueType . ')[]';
+        }
+
+        return $this->valueType . '[]';
+    }
 }

src/Types/Array_.php

@@ -24,23 +24,4 @@
  */
 final class Array_ extends AbstractList
 {
-    /**
-     * Returns a rendered output of the Type as it would be used in a DocBlock.
-     */
-    public function __toString() : string
-    {
-        if ($this->keyType) {
-            return 'array<' . $this->keyType . ',' . $this->valueType . '>';
-        }
-
-        if ($this->valueType instanceof Mixed_) {
-            return 'array';
-        }
-
-        if ($this->valueType instanceof Compound) {
-            return '(' . $this->valueType . ')[]';
-        }
-
-        return $this->valueType . '[]';
-    }
 }

src/Types/Expression_.php

@@ -13,12 +13,33 @@
 
 namespace phpDocumentor\Reflection\Types;
 
+use phpDocumentor\Reflection\Type;
+
 /**
- * Represents an array type as described in the PSR-5, the PHPDoc Standard.
+ * Represents an expression type as described in the PSR-5, the PHPDoc Standard.
  *
  */
-final class Expression_ extends AbstractList
+final class Expression_ implements Type
 {
+    /** @var Type */
+    protected $valueType;
+
+    /**
+     * Initializes this representation of an array with the given Type.
+     */
+    public function __construct(Type $valueType)
+    {
+        $this->valueType      = $valueType;
+    }
+
+    /**
+     * Returns the value for the keys of this array.
+     */
+    public function getValueType() : Type
+    {
+        return $this->valueType;
+    }
+
     /**
      * Returns a rendered output of the Type as it would be used in a DocBlock.
      */