Merge pull request #844 from driehle/drop-psalm

driehle · web-flow · commit 47231be69c03 · 2024-12-24T12:34:28.000+01:00
Removed Psalm in favour of PHPStan
diff --git 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
@@ -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
diff --git a/psalm.xml b/psalm.xml
diff --git 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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use function array_map;`
`12`	`12`	`use function is_array;`
`13`	`13`
`14`		`-/** @psalm-import-type ValueOptionSpec from MultiCheckbox */`
	`14`	`+/** @phpstan-import-type ValueOptionSpec from MultiCheckbox */`
`15`	`15`	`class ObjectMultiCheckbox extends MultiCheckbox`
`16`	`16`	`{`
`17`	`17`	`use GetProxy;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Laminas\Form\Element\MultiCheckbox;`
`8`	`8`	`use Laminas\Form\Element\Radio as RadioElement;`
`9`	`9`
`10`		`-/** @psalm-import-type ValueOptionSpec from MultiCheckbox */`
	`10`	`+/** @phpstan-import-type ValueOptionSpec from MultiCheckbox */`
`11`	`11`	`class ObjectRadio extends RadioElement`
`12`	`12`	`{`
`13`	`13`	`use GetProxy;`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ final class Authentication extends AbstractOptions`
`65`	`65`	`/**`
`66`	`66`	`* Entity's class name`
`67`	`67`	`*`
`68`		`- * @psalm-var class-string`
	`68`	`+ * @phpstan-var class-string`
`69`	`69`	`*/`
`70`	`70`	`protected string $identityClass;`
`71`	`71`