Update psalm to 6.x and minimum PHP to 8.1

mmoll · mmoll · commit 79cd76e6dd9d · 2025-01-26T15:38:03.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,14 +40,10 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php_version:
-#          - 7.2
-#          - 7.3
-          - 7.4
-          - 8.0
           - 8.1
           - 8.2
           - 8.3
-#          - 8.4
+          - 8.4
         dependencies_level:
           - --prefer-lowest
           - ""
diff --git a/MO4/Library/PregLibrary.php b/MO4/Library/PregLibrary.php
@@ -36,14 +36,11 @@ class PregLibrary
      * @return array<string>|array<array>
      *
      * @throws RuntimeException
-     *
-     * @psalm-suppress ArgumentTypeCoercion
      */
     public static function MO4PregSplit(string $pattern, string $subject, int $limit = -1, int $flags = 0): array
     {
         $pregSplitResult = \preg_split($pattern, $subject, $limit, $flags);
 
-        // @phan-suppress-next-line PhanTypeComparisonToArray
         if (false === $pregSplitResult) {
             throw new RuntimeException('Unexpected Error in MO4 Coding Standard.');
         }
diff --git a/MO4/Sniffs/Arrays/ArrayDoubleArrowAlignmentSniff.php b/MO4/Sniffs/Arrays/ArrayDoubleArrowAlignmentSniff.php
@@ -30,6 +30,8 @@
  * @license   http://spdx.org/licenses/MIT MIT License
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
+ *
+ * @psalm-api
  */
 class ArrayDoubleArrowAlignmentSniff implements Sniff
 {
diff --git a/MO4/Sniffs/Arrays/MultiLineArraySniff.php b/MO4/Sniffs/Arrays/MultiLineArraySniff.php
@@ -27,6 +27,8 @@
  * @license   http://spdx.org/licenses/MIT MIT License
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
+ *
+ * @psalm-api
  */
 class MultiLineArraySniff implements Sniff
 {
diff --git a/MO4/Sniffs/Commenting/PropertyCommentSniff.php b/MO4/Sniffs/Commenting/PropertyCommentSniff.php
@@ -32,6 +32,8 @@
  * @license   http://spdx.org/licenses/MIT MIT License
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
+ *
+ * @psalm-api
  */
 class PropertyCommentSniff extends AbstractScopeSniff
 {
diff --git a/MO4/Sniffs/Formatting/AlphabeticalUseStatementsSniff.php b/MO4/Sniffs/Formatting/AlphabeticalUseStatementsSniff.php
@@ -33,6 +33,8 @@
  * @license   http://spdx.org/licenses/MIT MIT License
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
+ *
+ * @psalm-api
  */
 class AlphabeticalUseStatementsSniff extends UseDeclarationSniff
 {
diff --git a/MO4/Sniffs/Formatting/UnnecessaryNamespaceUsageSniff.php b/MO4/Sniffs/Formatting/UnnecessaryNamespaceUsageSniff.php
@@ -34,6 +34,8 @@
  * @license   http://spdx.org/licenses/MIT MIT License
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
+ *
+ * @psalm-api
  */
 class UnnecessaryNamespaceUsageSniff implements Sniff
 {
diff --git a/MO4/Sniffs/Strings/VariableInDoubleQuotedStringSniff.php b/MO4/Sniffs/Strings/VariableInDoubleQuotedStringSniff.php
@@ -29,6 +29,8 @@
  * @license   http://spdx.org/licenses/MIT MIT License
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
+ *
+ * @psalm-api
  */
 class VariableInDoubleQuotedStringSniff implements Sniff
 {
diff --git a/MO4/Sniffs/WhiteSpace/ConstantSpacingSniff.php b/MO4/Sniffs/WhiteSpace/ConstantSpacingSniff.php
@@ -27,6 +27,8 @@
  * @license   http://spdx.org/licenses/MIT MIT License
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
+ *
+ * @psalm-api
  */
 class ConstantSpacingSniff implements Sniff
 {
diff --git a/MO4/Sniffs/WhiteSpace/MultipleEmptyLinesSniff.php b/MO4/Sniffs/WhiteSpace/MultipleEmptyLinesSniff.php
@@ -13,6 +13,9 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
+/**
+ * @psalm-api
+ */
 class MultipleEmptyLinesSniff implements Sniff
 {
     /**
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "source": "https://github.com/mayflower/mo4-coding-standard"
     },
     "require": {
-        "php": "~7.4 || ~8.0",
+        "php": "~8.1",
         "dealerdirect/phpcodesniffer-composer-installer": "~0.7 || ~1.0",
         "escapestudios/symfony2-coding-standard": "^3.10.0",
         "slevomat/coding-standard": "^8.14",
@@ -34,9 +34,9 @@
         "phan/phan": "^5.4.2",
         "phpstan/phpstan": "^1.12",
         "phpstan/phpstan-strict-rules": "^1.6",
-        "phpunit/phpunit": "^7.5.20 || ^8.5.36 || ^9.6.15",
-        "psalm/plugin-phpunit": "^0.18",
-        "vimeo/psalm": "^5.26"
+        "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+        "psalm/plugin-phpunit": "^0.19",
+        "vimeo/psalm": "^6.0.0"
     },
     "config": {
         "allow-plugins": {
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="dev-master@765dcbfe43002e52e4808b65561842784fe7bcc7">
+  <file src="MO4/Library/PregLibrary.php">
+    <ArgumentTypeCoercion>
+      <code><![CDATA[$flags]]></code>
+      <code><![CDATA[$pattern]]></code>
+    </ArgumentTypeCoercion>
+  </file>
+</files>
diff --git a/psalm.xml b/psalm.xml
@@ -5,6 +5,7 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     autoloader="tests/bootstrap.php"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="MO4" />

Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,11 @@ class PregLibrary`
`36`	`36`	`* @return array<string>\|array<array>`
`37`	`37`	`*`
`38`	`38`	`* @throws RuntimeException`
`39`		`- *`
`40`		`- * @psalm-suppress ArgumentTypeCoercion`
`41`	`39`	`*/`
`42`	`40`	`public static function MO4PregSplit(string $pattern, string $subject, int $limit = -1, int $flags = 0): array`
`43`	`41`	`{`
`44`	`42`	`$pregSplitResult = \preg_split($pattern, $subject, $limit, $flags);`
`45`	`43`
`46`		`- // @phan-suppress-next-line PhanTypeComparisonToArray`
`47`	`44`	`if (false === $pregSplitResult) {`
`48`	`45`	`throw new RuntimeException('Unexpected Error in MO4 Coding Standard.');`
`49`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@`
`30`	`30`	`* @license http://spdx.org/licenses/MIT MIT License`
`31`	`31`	`*`
`32`	`32`	`* @link https://github.com/mayflower/mo4-coding-standard`
	`33`	`+ *`
	`34`	`+ * @psalm-api`
`33`	`35`	`*/`
`34`	`36`	`class ArrayDoubleArrowAlignmentSniff implements Sniff`
`35`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`	`* @license http://spdx.org/licenses/MIT MIT License`
`28`	`28`	`*`
`29`	`29`	`* @link https://github.com/mayflower/mo4-coding-standard`
	`30`	`+ *`
	`31`	`+ * @psalm-api`
`30`	`32`	`*/`
`31`	`33`	`class MultiLineArraySniff implements Sniff`
`32`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@`
`32`	`32`	`* @license http://spdx.org/licenses/MIT MIT License`
`33`	`33`	`*`
`34`	`34`	`* @link https://github.com/mayflower/mo4-coding-standard`
	`35`	`+ *`
	`36`	`+ * @psalm-api`
`35`	`37`	`*/`
`36`	`38`	`class PropertyCommentSniff extends AbstractScopeSniff`
`37`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@`
`33`	`33`	`* @license http://spdx.org/licenses/MIT MIT License`
`34`	`34`	`*`
`35`	`35`	`* @link https://github.com/mayflower/mo4-coding-standard`
	`36`	`+ *`
	`37`	`+ * @psalm-api`
`36`	`38`	`*/`
`37`	`39`	`class AlphabeticalUseStatementsSniff extends UseDeclarationSniff`
`38`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@`
`34`	`34`	`* @license http://spdx.org/licenses/MIT MIT License`
`35`	`35`	`*`
`36`	`36`	`* @link https://github.com/mayflower/mo4-coding-standard`
	`37`	`+ *`
	`38`	`+ * @psalm-api`
`37`	`39`	`*/`
`38`	`40`	`class UnnecessaryNamespaceUsageSniff implements Sniff`
`39`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`	`* @license http://spdx.org/licenses/MIT MIT License`
`30`	`30`	`*`
`31`	`31`	`* @link https://github.com/mayflower/mo4-coding-standard`
	`32`	`+ *`
	`33`	`+ * @psalm-api`
`32`	`34`	`*/`
`33`	`35`	`class VariableInDoubleQuotedStringSniff implements Sniff`
`34`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`	`use PHP_CodeSniffer\Files\File;`
`14`	`14`	`use PHP_CodeSniffer\Sniffs\Sniff;`
`15`	`15`
	`16`	`+/**`
	`17`	`+ * @psalm-api`
	`18`	`+ */`
`16`	`19`	`class MultipleEmptyLinesSniff implements Sniff`
`17`	`20`	`{`
`18`	`21`	`/**`