Cleanup code and ci scripts

Upgrade to the latest psalm
Use psalm/phar
fix some static analisys issues.

Author: jaapio

.github/workflows/push.yml

@@ -177,7 +177,7 @@ jobs:
       matrix:
         operating-system:
           - ubuntu-latest
-        php-versions: ['7.2']
+        php-versions: ['7.3']
     env:
       extensions: mbstring
       key: cache-v1 # can be any string, change to clear the extension cache.
@@ -207,7 +207,6 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: ${{ env.extensions }}
-          tools: psalm
           ini-values: memory_limit=2G, display_errors=On, error_reporting=-1
 
       - name: Get composer cache directory
@@ -225,7 +224,7 @@ jobs:
         run: composer install --no-interaction --prefer-dist --optimize-autoloader
 
       - name: Run psalm
-        run: psalm --output-format=github
+        run: vendor/bin/psalm.phar
 
   bc_check:
     name: BC Check

Makefile

@@ -25,7 +25,7 @@ phpstan:
 
 .PHONY: psalm
 psalm:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.2 tools/psalm
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.3 vendor/bin/psalm.phar
 
 .PHONY: test
 test:

composer.json

@@ -14,7 +14,8 @@
         "phpdocumentor/reflection-common": "^2.0"
     },
     "require-dev": {
-        "ext-tokenizer": "*"
+        "ext-tokenizer": "*",
+        "psalm/phar": "^4.8"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpunit" version="^8.4" installed="8.4.3" location="./tools/phpunit" copy="true"/>
-  <phar name="psalm" version="^3.7.2" installed="3.16" location="./tools/psalm" copy="true"/>
 </phive>

phive.xml

@@ -1,7 +1,2 @@
 parameters:
     level: max
-
-    ignoreErrors:
-        # Bug in PHPStan? The error is "expects A, A given"
-        - '#Parameter \#1 \$tokens of method phpDocumentor\\Reflection\\Types\\ContextFactory::parse#'
-        # ArrayIterator::current can return null if iterated even if ArrayIterator::valid isn't checked before

phpstan.neon

@@ -13,6 +13,16 @@
     </projectFiles>
 
     <issueHandlers>
+        <UnnecessaryVarAnnotation>
+            <errorLevel type="info">
+                <file name="src/Types/ContextFactory.php"/>
+            </errorLevel>
+        </UnnecessaryVarAnnotation>
+        <UnusedMethodCall>
+            <errorLevel type="suppress">
+                <referencedMethod name="phpDocumentor\Reflection\Types\AggregatedType::add"/>
+            </errorLevel>
+        </UnusedMethodCall>
         <DocblockTypeContradiction>
             <errorLevel type="info">
                 <!-- ArrayIterator::current can return null if iterated even if ArrayIterator::valid isn't checked before -->

psalm.xml

@@ -348,7 +348,15 @@ public function addKeyword(string $keyword, string $typeClassName) : void
             );
         }
 
-        if (!in_array(Type::class, class_implements($typeClassName), true)) {
+        $interfaces = class_implements($typeClassName);
+        if ($interfaces === false) {
+            throw new InvalidArgumentException(
+                'The Value Object that needs to be created with a keyword "' . $keyword . '" must be an existing class'
+                . ' but we could not find the class ' . $typeClassName
+            );
+        }
+
+        if (!in_array(Type::class, $interfaces, true)) {
             throw new InvalidArgumentException(
                 'The class "' . $typeClassName . '" must implement the interface "phpDocumentor\Reflection\Type"'
             );

src/TypeResolver.php

@@ -108,25 +108,18 @@ private function createFromReflectionParameter(ReflectionParameter $parameter) :
             throw new InvalidArgumentException('Unable to get class of ' . $parameter->getName());
         }
 
-        //phpcs:ignore SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable
-        /** @var ReflectionClass<object> $class */
-
         return $this->createFromReflectionClass($class);
     }
 
     private function createFromReflectionMethod(ReflectionMethod $method) : Context
     {
-        //phpcs:ignore SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable
-        /** @var ReflectionClass<object> $class */
         $class = $method->getDeclaringClass();
 
         return $this->createFromReflectionClass($class);
     }
 
     private function createFromReflectionProperty(ReflectionProperty $property) : Context
     {
-        //phpcs:ignore SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable
-        /** @var ReflectionClass<object> $class */
         $class = $property->getDeclaringClass();
 
         return $this->createFromReflectionClass($class);
@@ -135,14 +128,14 @@ private function createFromReflectionProperty(ReflectionProperty $property) : Co
     private function createFromReflectionClassConstant(ReflectionClassConstant $constant) : Context
     {
         //phpcs:ignore SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable
-        /** @var ReflectionClass<object> $class */
+        /** @phpstan-var ReflectionClass<object> $class */
         $class = $constant->getDeclaringClass();
 
         return $this->createFromReflectionClass($class);
     }
 
     /**
-     * @param ReflectionClass<object> $class
+     * @phpstan-param ReflectionClass<object> $class
      */
     private function createFromReflectionClass(ReflectionClass $class) : Context
     {