From 18a561c5fffde31523096c92d687938bb9378cd8 Mon Sep 17 00:00:00 2001
From: Dennis Riehle <webmaster@riehle-web.com>
Date: Tue, 24 Dec 2024 12:29:40 +0100
Subject: [PATCH] removed Psalm in favour of PHPStan

---
 .gitattributes                           |  2 --
 composer.json                            |  5 +----
 psalm-baseline.xml                       | 25 ------------------------
 psalm.xml                                | 18 -----------------
 src/Form/Element/ObjectMultiCheckbox.php |  2 +-
 src/Form/Element/ObjectRadio.php         |  2 +-
 src/Options/Authentication.php           |  2 +-
 src/Paginator/Adapter/Collection.php     |  4 ++--
 8 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 psalm-baseline.xml
 delete mode 100644 psalm.xml

diff --git a/.gitattributes b/.gitattributes
index 6d508fb6..5fef55da 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,4 @@
 /phpcs.xml.dist export-ignore
 /phpstan.neon export-ignore
 /phpunit.xml.dist export-ignore
-/psalm.xml export-ignore
-/psalm-baseline.xml export-ignore
 /tests/ export-ignore
diff --git a/composer.json b/composer.json
index 0656ba91..3c7a2a58 100644
--- a/composer.json
+++ b/composer.json
@@ -74,8 +74,7 @@
         "phpstan/phpstan": "^1.9.2",
         "phpstan/phpstan-phpunit": "^1.3.0",
         "phpunit/phpunit": "^9.5.27",
-        "predis/predis": "^1.1.10",
-        "vimeo/psalm": "^5.0"
+        "predis/predis": "^1.1.10"
     },
     "conflict": {
         "doctrine/orm": "2.12.0"
@@ -115,13 +114,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"
     }
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
deleted file mode 100644
index 1e637365..00000000
--- a/psalm-baseline.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
-  <file src="src/ConfigProvider.php">
-    <UndefinedClass occurrences="11">
-      <code>DoctrineCache\ApcCache</code>
-      <code>DoctrineCache\ApcuCache</code>
-      <code>DoctrineCache\ArrayCache</code>
-      <code>DoctrineCache\FilesystemCache</code>
-      <code>DoctrineCache\MemcacheCache</code>
-      <code>DoctrineCache\MemcachedCache</code>
-      <code>DoctrineCache\PredisCache</code>
-      <code>DoctrineCache\RedisCache</code>
-      <code>DoctrineCache\WinCacheCache</code>
-      <code>DoctrineCache\XcacheCache</code>
-      <code>DoctrineCache\ZendDataCache</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Service/CacheFactory.php">
-    <UndefinedClass occurrences="3">
-      <code>Cache\FilesystemCache</code>
-      <code>Cache\MemcacheCache</code>
-      <code>Cache\PredisCache</code>
-    </UndefinedClass>
-  </file>
-</files>
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index 3923b42b..00000000
--- a/psalm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="4"
-    findUnusedCode="false"
-    findUnusedBaselineEntry="true"
-    resolveFromConfigFile="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    errorBaseline="psalm-baseline.xml"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-</psalm>
diff --git a/src/Form/Element/ObjectMultiCheckbox.php b/src/Form/Element/ObjectMultiCheckbox.php
index 48068f17..1ce46948 100644
--- a/src/Form/Element/ObjectMultiCheckbox.php
+++ b/src/Form/Element/ObjectMultiCheckbox.php
@@ -11,7 +11,7 @@
 use function array_map;
 use function is_array;
 
-/** @psalm-import-type ValueOptionSpec from MultiCheckbox */
+/** @phpstan-import-type ValueOptionSpec from MultiCheckbox */
 class ObjectMultiCheckbox extends MultiCheckbox
 {
     use GetProxy;
diff --git a/src/Form/Element/ObjectRadio.php b/src/Form/Element/ObjectRadio.php
index 451ae483..40bca8c0 100644
--- a/src/Form/Element/ObjectRadio.php
+++ b/src/Form/Element/ObjectRadio.php
@@ -7,7 +7,7 @@
 use Laminas\Form\Element\MultiCheckbox;
 use Laminas\Form\Element\Radio as RadioElement;
 
-/** @psalm-import-type ValueOptionSpec from MultiCheckbox */
+/** @phpstan-import-type ValueOptionSpec from MultiCheckbox */
 class ObjectRadio extends RadioElement
 {
     use GetProxy;
diff --git a/src/Options/Authentication.php b/src/Options/Authentication.php
index 36413ca7..6875fa7c 100644
--- a/src/Options/Authentication.php
+++ b/src/Options/Authentication.php
@@ -65,7 +65,7 @@ final class Authentication extends AbstractOptions
     /**
      * Entity's class name
      *
-     * @psalm-var class-string
+     * @phpstan-var class-string
      */
     protected string $identityClass;
 
diff --git a/src/Paginator/Adapter/Collection.php b/src/Paginator/Adapter/Collection.php
index fe8e0a0c..d2d60145 100644
--- a/src/Paginator/Adapter/Collection.php
+++ b/src/Paginator/Adapter/Collection.php
@@ -11,8 +11,8 @@
 use function count;
 
 /**
- * @psalm-template TKey of array-key
- * @psalm-template T
+ * @phpstan-template TKey of array-key
+ * @phpstan-template T
  * @template-implements AdapterInterface<int, T>
  */
 class Collection implements AdapterInterface