Bump psalm & fix issues

Author: jaapio

Makefile

@@ -13,16 +13,15 @@ setup: install-phive
 
 .PHONY: phpcs
 phpcs:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpcs-ga:v1.0.0 -s
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpcs-ga:latest -s
 
 .PHONY: phpstan
 phpstan:
 	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpstan-ga:latest analyse src --no-progress --configuration phpstan.neon
 
 .PHONY: psaml
 psalm:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project mickaelandrieu/psalm-ga
-
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.2 tools/psalm
 .PHONY: test
 test:
 	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.2 tools/phpunit

phive.xml

@@ -1,4 +1,5 @@
 <?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.7.2" location="./tools/psalm" copy="true"/>
 </phive>

src/Types/ContextFactory.php

@@ -64,7 +64,6 @@ final class ContextFactory
     public function createFromReflector(Reflector $reflector) : Context
     {
         if ($reflector instanceof ReflectionClass) {
-            /** @var ReflectionClass<object> $reflector */
             return $this->createFromReflectionClass($reflector);
         }
 
@@ -91,7 +90,9 @@ private function createFromReflectionParameter(ReflectionParameter $parameter) :
     {
         $class = $parameter->getDeclaringClass();
         if ($class) {
+            //phpcs:ignore SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable
             /** @var ReflectionClass<object> $class */
+
             return $this->createFromReflectionClass($class);
         }
 
@@ -114,7 +115,7 @@ private function createFromReflectionClassConstant(ReflectionClassConstant $cons
     }
 
     /**
-     * @param ReflectionClass<object> $class
+     * @phpstan-param ReflectionClass<object> $class
      */
     private function createFromReflectionClass(ReflectionClass $class) : Context
     {