Fix code style issues

Author: jaapio

src/TypeResolver.php

@@ -16,11 +16,11 @@
 use ArrayIterator;
 use InvalidArgumentException;
 use phpDocumentor\Reflection\Types\Array_;
-use phpDocumentor\Reflection\Types\Expression_;
 use phpDocumentor\Reflection\Types\ClassString;
 use phpDocumentor\Reflection\Types\Collection;
 use phpDocumentor\Reflection\Types\Compound;
 use phpDocumentor\Reflection\Types\Context;
+use phpDocumentor\Reflection\Types\Expression_;
 use phpDocumentor\Reflection\Types\Integer;
 use phpDocumentor\Reflection\Types\Iterable_;
 use phpDocumentor\Reflection\Types\Nullable;
@@ -29,15 +29,16 @@
 use RuntimeException;
 use function array_key_exists;
 use function array_pop;
+use function array_values;
 use function class_exists;
 use function class_implements;
 use function count;
+use function end;
 use function in_array;
+use function key;
 use function preg_split;
-use function strlen;
 use function strpos;
 use function strtolower;
-use function substr;
 use function trim;
 use const PREG_SPLIT_DELIM_CAPTURE;
 use const PREG_SPLIT_NO_EMPTY;
@@ -252,6 +253,7 @@ private function parseTypes(ArrayIterator $tokens, Context $context, int $parser
                 if ($lastItem instanceof Expression_) {
                     $lastItem = $lastItem->getValueType();
                 }
+
                 $types[$last] = new Array_($lastItem);
 
                 $tokens->next();
@@ -294,7 +296,7 @@ private function parseTypes(ArrayIterator $tokens, Context $context, int $parser
             return $types[0];
         }
 
-        return new Compound($types, $compoundToken);
+        return new Compound(array_values($types), $compoundToken);
     }
 
     /**

src/Types/Expression_.php

@@ -10,12 +10,15 @@
  *
  * @link      http://phpdoc.org
  */
+
 namespace phpDocumentor\Reflection\Types;
 
 use phpDocumentor\Reflection\Type;
 
 /**
  * Represents an expression type as described in the PSR-5, the PHPDoc Standard.
+ *
+ * @psalm-immutable
  */
 final class Expression_ implements Type
 {

tests/unit/TypeResolverTest.php

@@ -15,11 +15,11 @@
 
 use Mockery as m;
 use phpDocumentor\Reflection\Types\Array_;
-use phpDocumentor\Reflection\Types\Expression_;
 use phpDocumentor\Reflection\Types\Boolean;
 use phpDocumentor\Reflection\Types\ClassString;
 use phpDocumentor\Reflection\Types\Compound;
 use phpDocumentor\Reflection\Types\Context;
+use phpDocumentor\Reflection\Types\Expression_;
 use phpDocumentor\Reflection\Types\Iterable_;
 use phpDocumentor\Reflection\Types\Null_;
 use phpDocumentor\Reflection\Types\Nullable;
@@ -269,10 +269,16 @@ public function testResolvingAmpersandCompoundTypes() : void
     {
         $fixture = new TypeResolver();
 
-        $resolvedType = $fixture->resolve('Reflection\DocBlock&\PHPUnit\Framework\MockObject\MockObject ', new Context('phpDocumentor'));
+        $resolvedType = $fixture->resolve(
+            'Reflection\DocBlock&\PHPUnit\Framework\MockObject\MockObject ',
+            new Context('phpDocumentor')
+        );
 
         $this->assertInstanceOf(Compound::class, $resolvedType);
-        $this->assertSame('\phpDocumentor\Reflection\DocBlock&\PHPUnit\Framework\MockObject\MockObject', (string) $resolvedType);
+        $this->assertSame(
+            '\phpDocumentor\Reflection\DocBlock&\PHPUnit\Framework\MockObject\MockObject',
+            (string) $resolvedType
+        );
 
         $firstType = $resolvedType->get(0);
 
@@ -300,17 +306,26 @@ public function testResolvingMixedCompoundTypes() : void
     {
         $fixture = new TypeResolver();
 
-        $resolvedType = $fixture->resolve('(Reflection\DocBlock&\PHPUnit\Framework\MockObject\MockObject)|null', new Context('phpDocumentor'));
+        $resolvedType = $fixture->resolve(
+            '(Reflection\DocBlock&\PHPUnit\Framework\MockObject\MockObject)|null',
+            new Context('phpDocumentor')
+        );
 
         $this->assertInstanceOf(Compound::class, $resolvedType);
-        $this->assertSame('(\phpDocumentor\Reflection\DocBlock&\PHPUnit\Framework\MockObject\MockObject)|null', (string) $resolvedType);
+        $this->assertSame(
+            '(\phpDocumentor\Reflection\DocBlock&\PHPUnit\Framework\MockObject\MockObject)|null',
+            (string) $resolvedType
+        );
 
         $firstType = $resolvedType->get(0);
 
         $secondType = $resolvedType->get(1);
 
         $this->assertInstanceOf(Expression_::class, $firstType);
-        $this->assertSame('(\phpDocumentor\Reflection\DocBlock&\PHPUnit\Framework\MockObject\MockObject)', (string) $firstType);
+        $this->assertSame(
+            '(\phpDocumentor\Reflection\DocBlock&\PHPUnit\Framework\MockObject\MockObject)',
+            (string) $firstType
+        );
         $this->assertInstanceOf(Null_::class, $secondType);
 
         $resolvedType = $firstType->getValueType();