Fix style issues

Author: jaapio

Makefile

@@ -19,10 +19,14 @@ phpcs:
 phpstan:
 	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpstan-ga:latest analyse src --no-progress --level max --configuration phpstan.neon
 
+.PHONY: psaml
+psalm:
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project mickaelandrieu/psalm-ga
+
 .PHONY: test
 test:
 	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.2 tools/phpunit
 
 .PHONY: pre-commit-test
-pre-commit-test: test phpcs phpstan
+pre-commit-test: test phpcs phpstan psalm
 

src/TypeResolver.php

@@ -391,7 +391,7 @@ private function resolveTypedObject(string $type, ?Context $context = null) : Ob
      */
     private function resolveCollection(ArrayIterator $tokens, Type $classType, Context $context) : Type
     {
-        $isArray = ((string) $classType === 'array');
+        $isArray    = ((string) $classType === 'array');
         $isIterable = ((string) $classType === 'iterable');
 
         // allow only "array", "iterable" or class name before "<"

src/Types/Iterable_.php

@@ -13,8 +13,6 @@
 
 namespace phpDocumentor\Reflection\Types;
 
-use phpDocumentor\Reflection\Type;
-
 /**
  * Value Object representing iterable type
  */

tests/unit/CollectionResolverTest.php

@@ -13,15 +13,13 @@
 
 namespace phpDocumentor\Reflection;
 
-use InvalidArgumentException;
 use phpDocumentor\Reflection\Types\Array_;
 use phpDocumentor\Reflection\Types\Collection;
 use phpDocumentor\Reflection\Types\Compound;
 use phpDocumentor\Reflection\Types\Context;
 use phpDocumentor\Reflection\Types\Object_;
 use phpDocumentor\Reflection\Types\String_;
 use PHPUnit\Framework\TestCase;
-use RuntimeException;
 
 /**
  * @covers ::<private>

tests/unit/FqsenResolverTest.php

@@ -13,7 +13,6 @@
 
 namespace phpDocumentor\Reflection;
 
-use InvalidArgumentException;
 use phpDocumentor\Reflection\Types\Context;
 use PHPUnit\Framework\TestCase;
 

tests/unit/TypeResolverTest.php

@@ -13,7 +13,6 @@
 
 namespace phpDocumentor\Reflection;
 
-use InvalidArgumentException;
 use Mockery as m;
 use phpDocumentor\Reflection\Types\Array_;
 use phpDocumentor\Reflection\Types\Boolean;

tests/unit/Types/ArrayTest.php

@@ -21,15 +21,17 @@
 class ArrayTest extends TestCase
 {
     /**
-     * @covers ::__toString
-     *
      * @dataProvider provideArrays
+     * @covers ::__toString
      */
     public function testArrayStringifyCorrectly(Array_ $array, string $expectedString) : void
     {
         $this->assertSame($expectedString, (string) $array);
     }
 
+    /**
+     * @return mixed[]
+     */
     public function provideArrays() : array
     {
         return [

tests/unit/Types/CollectionTest.php

@@ -22,22 +22,36 @@
 class CollectionTest extends TestCase
 {
     /**
-     * @covers ::__toString
-     *
      * @dataProvider provideCollections
+     * @covers ::__toString
      */
     public function testCollectionStringifyCorrectly(Collection $collection, string $expectedString) : void
     {
         $this->assertSame($expectedString, (string) $collection);
     }
 
+    /**
+     * @return mixed[]
+     */
     public function provideCollections() : array
     {
         return [
-            'simple collection' => [new Collection(null, new Integer()), 'object<int>'],
-            'simple collection with key type' => [new Collection(null, new Integer(), new String_()), 'object<string,int>'],
-            'collection of single type using specific class' => [new Collection(new Fqsen('\Foo\Bar'), new Integer()), '\Foo\Bar<int>'],
-            'collection of single type with key type and using specific class' => [new Collection(new Fqsen('\Foo\Bar'), new String_(), new Integer()), '\Foo\Bar<int,string>'],
+            'simple collection' => [
+                new Collection(null, new Integer()),
+                'object<int>',
+            ],
+            'simple collection with key type' => [
+                new Collection(null, new Integer(), new String_()),
+                'object<string,int>',
+            ],
+            'collection of single type using specific class' => [
+                new Collection(new Fqsen('\Foo\Bar'), new Integer()),
+                '\Foo\Bar<int>',
+            ],
+            'collection of single type with key type and using specific class' => [
+                new Collection(new Fqsen('\Foo\Bar'), new String_(), new Integer()),
+                '\Foo\Bar<int,string>',
+            ],
         ];
     }
 }

tests/unit/Types/CompoundTest.php

@@ -13,7 +13,6 @@
 
 namespace phpDocumentor\Reflection\Types;
 
-use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
 /**

tests/unit/Types/IterableTest.php

@@ -22,21 +22,26 @@ class IterableTest extends TestCase
 {
     /**
      * @covers ::__toString
-     *
      * @dataProvider provideIterables
      */
     public function testIterableStringifyCorrectly(Iterable_ $iterable, string $expectedString) : void
     {
         $this->assertSame($expectedString, (string) $iterable);
     }
 
+    /**
+     * @return mixed[]
+     */
     public function provideIterables() : array
     {
         return [
             'simple iterable' => [new Iterable_(), 'iterable'],
             'iterable of mixed' => [new Iterable_(new Mixed_()), 'iterable'],
             'iterable of single type' => [new Iterable_(new String_()), 'iterable<string>'],
-            'iterable of compound type' => [new Iterable_(new Compound([new Integer(), new String_()])), 'iterable<int|string>'],
+            'iterable of compound type' => [
+                new Iterable_(new Compound([new Integer(), new String_()])),
+                'iterable<int|string>',
+            ],
             'iterable with key type' => [new Iterable_(new String_(), new Integer()), 'iterable<int,string>'],
         ];
     }