Merge pull request #759 from driehle/drop-psalm

Removed Psalm in favour of PHPStan

Author: driehle

.gitattributes

@@ -5,6 +5,4 @@
 /phpcs.xml.dist export-ignore
 /phpstan.neon export-ignore
 /phpunit.xml.dist export-ignore
-/psalm.xml.dist export-ignore
-/psalm-baseline.xml export-ignore
 /tests/ export-ignore

composer.json

@@ -43,8 +43,7 @@
         "phpstan/phpstan": "^1.4.6",
         "phpstan/phpstan-phpunit": "^1.0.0",
         "phpunit/phpunit": "^9.5.13",
-        "squizlabs/php_codesniffer": "^3.6.2",
-        "vimeo/psalm": "^5.4.0"
+        "squizlabs/php_codesniffer": "^3.6.2"
     },
     "conflict": {
         "doctrine/migrations": "<3.3"
@@ -81,13 +80,11 @@
         "check": [
             "@cs-check",
             "@phpstan",
-            "@psalm",
             "@test"
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "phpstan": "phpstan analyse",
-        "psalm": "psalm --stats",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover=coverage.xml"
     }

psalm.xml

@@ -129,7 +129,6 @@ private function getObjectManagerName(): string
             return $this->defaultObjectManagerName;
         }
 
-        /** @psalm-suppress ReservedWord */
         return $arguments->getParameterOption('--object-manager');
     }
 

src/CliConfigurator.php

@@ -12,9 +12,9 @@
 /**
  * Paginator adapter for the Laminas\Paginator component
  *
- * @psalm-template T of object
- * @psalm-template TKey of int
- * @psalm-template TValue
+ * @phpstan-template T of object
+ * @phpstan-template TKey of int
+ * @phpstan-template TValue
  * @template-implements AdapterInterface<TKey, TValue>
  */
 class DoctrinePaginator implements AdapterInterface, JsonSerializable
@@ -57,8 +57,6 @@ public function getPaginator(): Paginator
      * @param int|null $itemCountPerPage
      *
      * @return ArrayIterator<TKey, TValue>
-     *
-     * @psalm-suppress LessSpecificImplementedReturnType
      */
     public function getItems($offset, $itemCountPerPage)
     {

src/Paginator/Adapter/DoctrinePaginator.php

@@ -58,7 +58,6 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?ar
         $configuration = $serviceLocator->get($options->getConfiguration());
         $eventManager  = $serviceLocator->get($options->getEventManager());
 
-        /** @psalm-suppress InvalidArgument */
         $connection = DriverManager::getConnection($params, $configuration, $eventManager);
         foreach ($options->getDoctrineTypeMappings() as $dbType => $doctrineType) {
             $connection->getDatabasePlatform()->registerDoctrineTypeMapping($dbType, $doctrineType);

src/Service/DBALConnectionFactory.php

@@ -111,7 +111,6 @@ private function getObjectManagerName(): string
             return $this->defaultObjectManagerName;
         }
 
-        /** @psalm-suppress ReservedWord */
         return $arguments->getParameterOption('--object-manager');
     }
 }

src/Service/MigrationsCommandFactory.php

@@ -79,7 +79,7 @@ protected function getOptions(ContainerInterface $serviceLocator): mixed
     }
 
     /**
-     * @psalm-return class-string
+     * @phpstan-return class-string
      */
     protected function getOptionsClass(): string
     {

src/Service/SQLLoggerCollectorFactory.php

@@ -209,7 +209,7 @@ private function getParent(ClassMetadata $class): ?ClassMetadata
     /**
      * Visit a given association and mark it as visited
      *
-     * @psalm-param class-string $className
+     * @phpstan-param class-string $className
      *
      * @return bool true if the association was visited before
      */