raise minimum PHP version to 8.1

.github/workflows/ci.yml

@@ -40,13 +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
         dependencies_level:
           - --prefer-lowest
           - ""
@@ -90,7 +87,7 @@ jobs:
         run: vendor/bin/phpstan analyse --no-progress
       - name: Run psalm
         if: ${{ matrix.os != 'windows-latest' }}
-        run: vendor/bin/psalm --show-info=true
+        run: vendor/bin/psalm
       - name: Run phan
         if: ${{ matrix.os != 'windows-latest' }}
         run: vendor/bin/phan

.phan/config.php

@@ -23,6 +23,7 @@
         'MO4',
         'tests',
         'vendor/squizlabs/php_codesniffer',
+        'vendor/symfony/polyfill-php83',
     ],
 
     // A directory list that defines files that will be excluded

MO4/Library/PregLibrary.php

@@ -16,7 +16,7 @@
 
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 
-class PregLibrary
+final class PregLibrary
 {
     /**
      * Split string by a regular expression

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
 {
@@ -51,6 +53,7 @@ class ArrayDoubleArrowAlignmentSniff implements Sniff
      *
      * @see    Tokens.php
      */
+    #[\Override]
     public function register(): array
     {
         return $this->arrayTokens;
@@ -67,6 +70,7 @@ public function register(): array
      *
      * @return void
      */
+    #[\Override]
     public function process(File $phpcsFile, $stackPtr): void
     {
         $tokens  = $phpcsFile->getTokens();

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
 {
@@ -48,6 +50,7 @@ class MultiLineArraySniff implements Sniff
      *
      * @see    Tokens.php
      */
+    #[\Override]
     public function register(): array
     {
         return $this->arrayTokens;
@@ -64,6 +67,7 @@ public function register(): array
      *
      * @return void
      */
+    #[\Override]
     public function process(File $phpcsFile, $stackPtr): void
     {
         $tokens  = $phpcsFile->getTokens();

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
 {
@@ -75,6 +77,7 @@ public function __construct()
      *
      * @throws RuntimeException
      */
+    #[\Override]
     protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope): void
     {
         $find   = [
@@ -109,8 +112,8 @@ protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScop
                     $stackPtr,
                     'NoDocBlockAllowed'
                 );
-            } elseif (0 !== \strncmp($tokens[$postComment]['content'], '//', 2)
-                && '*/' !== \substr($tokens[$postComment]['content'], -2)
+            } elseif (!\str_starts_with($tokens[$postComment]['content'], '//')
+                && !\str_ends_with($tokens[$postComment]['content'], '*/')
             ) {
                 $phpcsFile->addError(
                     'no multiline comments after declarations allowed',
@@ -243,6 +246,7 @@ protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScop
      *
      * @return void
      */
+    #[\Override]
     protected function processTokenOutsideScope(File $phpcsFile, $stackPtr): void
     {
     }

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
 {
@@ -87,6 +89,7 @@ class AlphabeticalUseStatementsSniff extends UseDeclarationSniff
      *
      * @return void
      */
+    #[\Override]
     public function process(File $phpcsFile, $stackPtr): void
     {
         if (!\in_array($this->order, self::SUPPORTED_ORDERING_METHODS, true)) {
@@ -292,7 +295,8 @@ private function findNewDestination(File $phpcsFile, int $stackPtr, string $impo
     {
         $tokens = $phpcsFile->getTokens();
 
-        $line     = $tokens[$stackPtr]['line'];
+        $line = $tokens[$stackPtr]['line'];
+        /** @var int|bool $prevLine */
         $prevLine = false;
         $prevPtr  = $stackPtr;
 
@@ -332,17 +336,13 @@ private function findNewDestination(File $phpcsFile, int $stackPtr, string $impo
      */
     private function compareString(string $a, string $b): int
     {
-        switch ($this->order) {
-            case 'string':
-                return \strcmp($a, $b);
-            case 'string-locale':
-                return \strcoll($a, $b);
-            case 'string-case-insensitive':
-                return \strcasecmp($a, $b);
-            default:
-                // Default is 'dictionary'.
-                return $this->dictionaryCompare($a, $b);
-        }
+        return match ($this->order) {
+            'string' => \strcmp($a, $b),
+            'string-locale' => \strcoll($a, $b),
+            'string-case-insensitive' => \strcasecmp($a, $b),
+            // Default is 'dictionary'.
+            default => $this->dictionaryCompare($a, $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
 {
@@ -54,6 +56,7 @@ class UnnecessaryNamespaceUsageSniff implements Sniff
      *
      * @see    Tokens.php
      */
+    #[\Override]
     public function register(): array
     {
         return [T_CLASS];
@@ -75,6 +78,7 @@ public function register(): array
      *
      * @throws RuntimeException
      */
+    #[\Override]
     public function process(File $phpcsFile, $stackPtr): void
     {
         $docCommentTags = [
@@ -357,7 +361,7 @@ private function checkShorthandPossible(File $phpcsFile, array $useStatements, s
             );
 
             $replaceClassName = true;
-        } elseif ('' !== $namespace && 0 === \strpos($fullClassName, $namespace)) {
+        } elseif ('' !== $namespace && \str_starts_with($fullClassName, $namespace)) {
             $replacement = \substr($fullClassName, \strlen($namespace));
 
             $data    = [
@@ -381,6 +385,7 @@ private function checkShorthandPossible(File $phpcsFile, array $useStatements, s
         if (true === $isDocBlock) {
             $tokens     = $phpcsFile->getTokens();
             $oldContent = $tokens[$startPtr]['content'];
+            /** @var string $newContent */
             $newContent = \str_replace($className, $replacement, $oldContent);
             $phpcsFile->fixer->replaceToken($startPtr, $newContent);
         } else {

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
 {
@@ -39,6 +41,7 @@ class VariableInDoubleQuotedStringSniff implements Sniff
      *
      * @see Tokens.php
      */
+    #[\Override]
     public function register(): array
     {
         return [T_DOUBLE_QUOTED_STRING];
@@ -58,6 +61,7 @@ public function register(): array
      *
      * @return void
      */
+    #[\Override]
     public function process(File $phpcsFile, $stackPtr): void
     {
         $varRegExp = '/\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/';
@@ -76,7 +80,7 @@ public function process(File $phpcsFile, $stackPtr): void
                 }
 
                 if (\strpos(\substr($content, 0, $pos), '{') > 0
-                    && false === \strpos(\substr($content, 0, $pos), '}')
+                    && !\str_contains(\substr($content, 0, $pos), '}')
                 ) {
                     continue;
                 }

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
 {
@@ -46,6 +48,7 @@ class ConstantSpacingSniff implements Sniff
      *
      * @see    Tokens.php
      */
+    #[\Override]
     public function register(): array
     {
         return $this->arrayTokens;
@@ -62,6 +65,7 @@ public function register(): array
      *
      * @return void
      */
+    #[\Override]
     public function process(File $phpcsFile, $stackPtr): void
     {
         $tokens  = $phpcsFile->getTokens();

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
 {
     /**
@@ -22,6 +25,7 @@ class MultipleEmptyLinesSniff implements Sniff
      *
      * @see Tokens.php
      */
+    #[\Override]
     public function register(): array
     {
         return [
@@ -41,6 +45,7 @@ public function register(): array
      *
      * @return void|int
      */
+    #[\Override]
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();

MO4/Tests/AbstractMo4SniffUnitTest.php

@@ -68,6 +68,7 @@ abstract class AbstractMo4SniffUnitTest extends AbstractSniffUnitTest
      *
      * @throws RuntimeException
      */
+    #[\Override]
     protected function getErrorList(string $testFile = ''): array
     {
         return $this->getRecordForTestFile($testFile, $this->expectedErrorList);
@@ -85,6 +86,7 @@ protected function getErrorList(string $testFile = ''): array
      *
      * @throws RuntimeException
      */
+    #[\Override]
     protected function getWarningList(string $testFile = ''): array
     {
         return $this->getRecordForTestFile($testFile, $this->expectedWarningList);

MO4/Tests/Arrays/ArrayDoubleArrowAlignmentUnitTest.php

@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-class ArrayDoubleArrowAlignmentUnitTest extends AbstractMo4SniffUnitTest
+final class ArrayDoubleArrowAlignmentUnitTest extends AbstractMo4SniffUnitTest
 {
     protected $expectedErrorList = [
         'ArrayDoubleArrowAlignmentUnitTest.pass.inc' => [],

MO4/Tests/Arrays/MultiLineArrayUnitTest.php

@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-class MultiLineArrayUnitTest extends AbstractMo4SniffUnitTest
+final class MultiLineArrayUnitTest extends AbstractMo4SniffUnitTest
 {
     protected $expectedErrorList = [
         'MultiLineArrayUnitTest.pass.inc' => [],

MO4/Tests/Commenting/PropertyCommentUnitTest.php

@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-class PropertyCommentUnitTest extends AbstractMo4SniffUnitTest
+final class PropertyCommentUnitTest extends AbstractMo4SniffUnitTest
 {
     protected $expectedErrorList = [
         'PropertyCommentUnitTest.pass.inc' => [],

MO4/Tests/Formatting/AlphabeticalUseStatementsUnitTest.php

@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-class AlphabeticalUseStatementsUnitTest extends AbstractMo4SniffUnitTest
+final class AlphabeticalUseStatementsUnitTest extends AbstractMo4SniffUnitTest
 {
     protected $expectedErrorList = [
         'AlphabeticalUseStatementsUnitTest.pass.inc'   => [],

MO4/Tests/Formatting/UnnecessaryNamespaceUsageUnitTest.php

@@ -32,7 +32,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-class UnnecessaryNamespaceUsageUnitTest extends AbstractMo4SniffUnitTest
+final class UnnecessaryNamespaceUsageUnitTest extends AbstractMo4SniffUnitTest
 {
     protected $expectedWarningList = [
         'UnnecessaryNamespaceUsageUnitTest.pass.1.inc' => [],

MO4/Tests/Strings/VariableInDoubleQuotedStringUnitTest.php

@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-class VariableInDoubleQuotedStringUnitTest extends AbstractMo4SniffUnitTest
+final class VariableInDoubleQuotedStringUnitTest extends AbstractMo4SniffUnitTest
 {
     protected $expectedErrorList = [
         'VariableInDoubleQuotedStringUnitTest.pass.inc' => [],

MO4/Tests/WhiteSpace/ConstantSpacingUnitTest.php

@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-class ConstantSpacingUnitTest extends AbstractMo4SniffUnitTest
+final class ConstantSpacingUnitTest extends AbstractMo4SniffUnitTest
 {
     protected $expectedErrorList = [
         'ConstantSpacingUnitTest.pass.inc' => [],

MO4/Tests/WhiteSpace/MultipleEmptyLinesUnitTest.php

@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-class MultipleEmptyLinesUnitTest extends AbstractMo4SniffUnitTest
+final class MultipleEmptyLinesUnitTest extends AbstractMo4SniffUnitTest
 {
     protected $expectedErrorList = [
         'MultipleEmptyLinesUnitTest.pass.inc' => [],