From 559ad183809c6176b09b09e5eeb3394eeabc9acd Mon Sep 17 00:00:00 2001
From: Antonio Mangiacapra <11173091+antonioeatgoat@users.noreply.github.com>
Date: Fri, 24 Feb 2023 12:15:17 +0100
Subject: [PATCH 01/18] Support ArgumentTypeDeclaration

---
 .../CodeQuality/ArgumentTypeDeclarationSniff.php     |  2 +-
 tests/fixtures/argument-type-declaration.php         | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php b/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php
index c715c6d..a22609c 100644
--- a/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php
@@ -40,7 +40,7 @@ public function register()
     {
         // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
-        return [T_FUNCTION, T_CLOSURE];
+        return [T_FUNCTION, T_CLOSURE, T_FN];
     }
 
     /**
diff --git a/tests/fixtures/argument-type-declaration.php b/tests/fixtures/argument-type-declaration.php
index e48435e..72ec9eb 100644
--- a/tests/fixtures/argument-type-declaration.php
+++ b/tests/fixtures/argument-type-declaration.php
@@ -129,6 +129,18 @@ function ()
 
 }
 
+fn() => true;
+
+// @phpcsWarningOnNextLine
+fn($foo) => $foo*2;
+
+fn(int $foo) => $foo*2;
+
+// @phpcsWarningOnNextLine
+fn(int $foo, $bar) => true;
+
+fn(int $foo, string $bar) => true;
+
 // @phpcsWarningOnNextLine
 function ($foo)
 {

From 8a5febb67468f909086f954202935c4dd9528685 Mon Sep 17 00:00:00 2001
From: Antonio Mangiacapra <11173091+antonioeatgoat@users.noreply.github.com>
Date: Fri, 24 Feb 2023 12:28:52 +0100
Subject: [PATCH 02/18] Add missing tests

---
 tests/fixtures/argument-type-declaration.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/fixtures/argument-type-declaration.php b/tests/fixtures/argument-type-declaration.php
index e48435e..64d70ea 100644
--- a/tests/fixtures/argument-type-declaration.php
+++ b/tests/fixtures/argument-type-declaration.php
@@ -279,6 +279,21 @@ function (PHPUnit\Exception $meh = null) use ($baz)
         }
     }
 
+    // @phpcsWarningOnNextLine
+    public function d(...$foo) {
+
+    }
+
+    // @phpcsWarningOnNextLine
+    public function e(...$foo) {
+        $bar = [1, 2, 3];
+
+        // @phpcsWarningOnNextLine
+        return function (...$bar) {
+
+        };
+    }
+
     public function buildCallback(): callable {
 
         /**

From d11762b2c20f3d8238d99196942fd3802b33588b Mon Sep 17 00:00:00 2001
From: Antonio Mangiacapra <11173091+antonioeatgoat@users.noreply.github.com>
Date: Fri, 24 Feb 2023 12:30:56 +0100
Subject: [PATCH 03/18] Cover array spread operator ase

---
 tests/fixtures/argument-type-declaration.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/fixtures/argument-type-declaration.php b/tests/fixtures/argument-type-declaration.php
index 72ec9eb..1cbca56 100644
--- a/tests/fixtures/argument-type-declaration.php
+++ b/tests/fixtures/argument-type-declaration.php
@@ -141,6 +141,11 @@ function ()
 
 fn(int $foo, string $bar) => true;
 
+// @phpcsWarningOnNextLine
+fn(...$foo) => true;
+
+fn(int ...$foo) => true;
+
 // @phpcsWarningOnNextLine
 function ($foo)
 {

From 063d49a386172b64161c09c6320b51184889cfb6 Mon Sep 17 00:00:00 2001
From: Antonio Mangiacapra <11173091+antonioeatgoat@users.noreply.github.com>
Date: Fri, 24 Feb 2023 17:20:22 +0100
Subject: [PATCH 04/18] Add rules for ReturnTypeDeclaration

---
 Inpsyde/PhpcsHelpers.php                            | 13 +++++++++++--
 .../CodeQuality/ReturnTypeDeclarationSniff.php      |  6 ++++--
 tests/fixtures/return-type-declaration.php          |  9 +++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Inpsyde/PhpcsHelpers.php b/Inpsyde/PhpcsHelpers.php
index fc6bd50..1048bdd 100644
--- a/Inpsyde/PhpcsHelpers.php
+++ b/Inpsyde/PhpcsHelpers.php
@@ -288,7 +288,7 @@ public static function isHookClosure(
         /** @var array<int, array<string, mixed>> $tokens */
         $tokens = $file->getTokens();
 
-        if (($tokens[$position]['code'] ?? '') !== T_CLOSURE) {
+        if (!in_array(($tokens[$position]['code'] ?? ''), [T_CLOSURE, T_FN], true)) {
             return false;
         }
 
@@ -486,7 +486,7 @@ public static function functionBoundaries(File $file, int $position): array
         /** @var array<int, array<string, mixed>> $tokens */
         $tokens = $file->getTokens();
 
-        if (!in_array(($tokens[$position]['code'] ?? null), [T_FUNCTION, T_CLOSURE], true)) {
+        if (!in_array(($tokens[$position]['code'] ?? null), [T_FUNCTION, T_CLOSURE, T_FN], true)) {
             return [-1, -1];
         }
 
@@ -539,6 +539,15 @@ public static function returnsCountInfo(File $file, int $position): array
         /** @var array<int, array<string, mixed>> $tokens */
         $tokens = $file->getTokens();
 
+        if (T_FN === $tokens[$position]['code'] ?? null) {
+            return [
+                'nonEmpty' => 1,
+                'void' => 0,
+                'null' => 0,
+                'total' => 1,
+            ];
+        }
+
         $pos = $start + 1;
         while ($pos < $end) {
             list(, $innerFunctionEnd) = self::functionBoundaries($file, $pos);
diff --git a/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php b/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php
index 44561e3..e2dd329 100644
--- a/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php
@@ -38,7 +38,7 @@ public function register()
     {
         // phpcs:enable Inpsyde.CodeQuality
 
-        return [T_FUNCTION, T_CLOSURE];
+        return [T_FUNCTION, T_CLOSURE, T_FN];
     }
 
     /**
@@ -170,7 +170,9 @@ private function maybeErrors(
             return;
         }
 
-        $name = (string)$file->getDeclarationName($position);
+        $tokenCode = $file->getTokens()[$position]['code'] ?? '';
+        // TODO Remove check on T_FN if getDeclarationName() will support T_FN out of the box
+        $name = $tokenCode !== T_FN ? (string)$file->getDeclarationName($position) : '';
         if (
             PhpcsHelpers::functionIsMethod($file, $position)
             && (in_array($name, self::METHODS_WHITELIST, true) || strpos($name, '__') === 0)
diff --git a/tests/fixtures/return-type-declaration.php b/tests/fixtures/return-type-declaration.php
index 7586634..72e7b67 100644
--- a/tests/fixtures/return-type-declaration.php
+++ b/tests/fixtures/return-type-declaration.php
@@ -218,6 +218,11 @@ function filter_wrapper(): bool
     return true;
 }
 
+// @phpcsWarningCodeOnNextLine NoReturnType
+fn() => true;
+
+fn(): bool => true;
+
 /**
  * @return string
  * @wp-hook Meh
@@ -266,6 +271,8 @@ public function filterWrapper(string $x, int $y): bool
             return "$x, $y";
         });
 
+        add_filter('x', fn($x, $y) => "$x, $y");
+
         return true;
     }
 
@@ -283,6 +290,8 @@ function ($x, $y) {
             10,
             2
         );
+
+        add_action('x', fn($x, $y) => "$x, $y");
     }
 
     // @phpcsWarningCodeOnNextLine NoReturnType

From f36c4665187b081b8f84bbf2c88b0cbcbf52089d Mon Sep 17 00:00:00 2001
From: Antonio Mangiacapra <11173091+antonioeatgoat@users.noreply.github.com>
Date: Fri, 24 Feb 2023 17:26:03 +0100
Subject: [PATCH 05/18] Cover hooks cases for ArgumentTypeDeclaration

---
 tests/fixtures/argument-type-declaration.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/fixtures/argument-type-declaration.php b/tests/fixtures/argument-type-declaration.php
index 1cbca56..0249ad1 100644
--- a/tests/fixtures/argument-type-declaration.php
+++ b/tests/fixtures/argument-type-declaration.php
@@ -91,6 +91,8 @@ function i(string $foo, ArrayObject ...$bar)
 
 }
 
+add_action('foo', fn ($foo) => 'x');
+
 add_action(
     'foo',
     function ($foo) {
@@ -117,6 +119,8 @@ static function ($foo) {
     }
 );
 
+add_filter('foo', fn ($foo) => 'x');
+
 array_map(
     function ($foo) { // @phpcsWarningOnThisLine
 

From 62544a2d4022b958b1de86ff66551b07a8b9a99e Mon Sep 17 00:00:00 2001
From: Antonio Mangiacapra <11173091+antonioeatgoat@users.noreply.github.com>
Date: Fri, 5 May 2023 12:29:07 +0200
Subject: [PATCH 06/18] Remove pointless TODO message

Apparently `getDeclarationName` will never support T_FN.
---
 Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php b/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php
index e2dd329..af97b61 100644
--- a/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php
@@ -171,8 +171,8 @@ private function maybeErrors(
         }
 
         $tokenCode = $file->getTokens()[$position]['code'] ?? '';
-        // TODO Remove check on T_FN if getDeclarationName() will support T_FN out of the box
         $name = $tokenCode !== T_FN ? (string)$file->getDeclarationName($position) : '';
+
         if (
             PhpcsHelpers::functionIsMethod($file, $position)
             && (in_array($name, self::METHODS_WHITELIST, true) || strpos($name, '__') === 0)

From 1e85d9a53bf6312a5eec4ffd5dea7e73e44d8f82 Mon Sep 17 00:00:00 2001
From: Antonio Mangiacapra <11173091+antonioeatgoat@users.noreply.github.com>
Date: Fri, 25 Aug 2023 12:55:22 +0200
Subject: [PATCH 07/18] Update dependencies

---
 composer.json                      |  7 +++----
 phpcs.xml                          | 10 ++++++----
 tests/cases/FixturesTest.php       |  1 +
 tests/src/FixtureContentParser.php |  4 ++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index ff6f4fa..7644e18 100644
--- a/composer.json
+++ b/composer.json
@@ -29,11 +29,10 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": ">=7",
+        "php": ">=7.4",
         "squizlabs/php_codesniffer": "^3.6.0",
-        "dealerdirect/phpcodesniffer-composer-installer": "~0.7.0",
-        "wp-coding-standards/wpcs": "^2.3",
-        "automattic/vipwpcs": "^2.2",
+        "dealerdirect/phpcodesniffer-composer-installer": "~1.0.0",
+        "automattic/vipwpcs": "dev-3.0/updates-for-wpcs-3.0",
         "phpcompatibility/php-compatibility": "^9.3.5",
         "automattic/phpcs-neutron-standard": "^1.6.0"
     },
diff --git a/phpcs.xml b/phpcs.xml
index 8a81c7a..dec7c58 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -60,9 +60,7 @@
     Curated list of WordPress specific rules.
     See https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
     -->
-    <rule ref="WordPress.Arrays.CommaAfterArrayItem"/>
-    <rule ref="WordPress.CodeAnalysis.AssignmentInCondition"/>
-    <rule ref="WordPress.CodeAnalysis.EmptyStatement"/>
+    <rule ref="WordPress.CodeAnalysis.AssignmentInTernaryCondition"/>
     <rule ref="WordPress.CodeAnalysis.EscapedNotTranslated"/>
     <rule ref="WordPress.DB.PreparedSQLPlaceholders"/>
     <rule ref="WordPress.DB.PreparedSQL"/>
@@ -98,7 +96,6 @@
     <rule ref="WordPress.PHP.POSIXFunctions"/>
     <rule ref="WordPress.PHP.PregQuoteDelimiter"/>
     <rule ref="WordPress.PHP.RestrictedPHPFunctions"/>
-    <rule ref="WordPress.PHP.StrictComparisons"/>
     <rule ref="WordPress.PHP.StrictInArray"/>
     <rule ref="WordPress.PHP.TypeCasts"/>
     <rule ref="WordPress.Security.EscapeOutput"/>
@@ -152,6 +149,8 @@
     Generic
     -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Generic.CodeAnalysis.AssignmentInCondition"/>
+    <rule ref="Generic.CodeAnalysis.EmptyPHPStatement"/>
     <rule ref="Generic.Metrics.CyclomaticComplexity">
         <properties>
             <property name="absoluteComplexity" value="50"/>
@@ -161,6 +160,7 @@
     <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag"/>
     <rule ref="Generic.PHP.LowerCaseConstant"/>
     <rule ref="Generic.VersionControl.GitMergeConflict"/>
+    <rule ref="NormalizedArrays.Arrays.CommaAfterLast"/>
     <rule ref="Squiz.Classes.LowercaseClassKeywords"/>
     <rule ref="Squiz.PHP.CommentedOutCode">
         <properties>
@@ -173,6 +173,8 @@
     <rule ref="Squiz.PHP.NonExecutableCode"/>
     <rule ref="Squiz.Scope.MemberVarScope"/>
     <rule ref="Squiz.Scope.StaticThisUsage"/>
+    <rule ref="Universal.Operators.StrictComparisons" />
+    <rule ref="Universal.WhiteSpace.CommaSpacing"/>
 
     <!--
     PHPCompatibility
diff --git a/tests/cases/FixturesTest.php b/tests/cases/FixturesTest.php
index 47c9dd0..c59eef3 100644
--- a/tests/cases/FixturesTest.php
+++ b/tests/cases/FixturesTest.php
@@ -198,6 +198,7 @@ private function createPhpcsForFixture(
         $sniffName = str_replace('.', DIRECTORY_SEPARATOR, $sniffName) . 'Sniff';
         $sniffFile = getenv('SNIFFS_PATH') . DIRECTORY_SEPARATOR . "{$sniffName}.php";
         if (!file_exists($sniffFile) || !is_readable($sniffFile)) {
+            // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
             throw new Exception("Non-existent of unreadable sniff file '$sniffFile' found.");
         }
 
diff --git a/tests/src/FixtureContentParser.php b/tests/src/FixtureContentParser.php
index c80d777..6b934a1 100644
--- a/tests/src/FixtureContentParser.php
+++ b/tests/src/FixtureContentParser.php
@@ -35,6 +35,7 @@ class FixtureContentParser
     public function parse(string $fixturePath): array
     {
         if (!file_exists($fixturePath) || !is_readable($fixturePath)) {
+            // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
             throw new Exception("Fixture file {$fixturePath} is not readable.");
         }
 
@@ -104,12 +105,14 @@ private function processResults(\stdClass $accumulator, string $fixturePath): ar
             || !is_array($results[4] ?? null)
         ) {
             throw new Exception(
+                // phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped
                 sprintf(
                     "Process callback for fixture '%s' (lines #%s:#%s) returned invalid output.",
                     $fixturePath,
                     $accumulator->process->start,
                     $accumulator->process->end
                 )
+                // phpcs:enable WordPress.Security.EscapeOutput.OutputNotEscaped
             );
         }
 
@@ -137,6 +140,7 @@ private function checkSniffName(string $sniff = null): string
         }
 
         if (!preg_match('~^' . $regex . '$~', $sniff)) {
+            // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
             throw new Exception("Invalid sniff name '{$sniff}'.");
         }
 

From a2f97c9dc4f668f54d6c2f9962b21866c9d8574f Mon Sep 17 00:00:00 2001
From: Antonio Mangiacapra <11173091+antonioeatgoat@users.noreply.github.com>
Date: Fri, 25 Aug 2023 13:08:05 +0200
Subject: [PATCH 08/18] Remove older PHP version from GitHub QA action

---
 .github/workflows/php-qa.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php-qa.yml b/.github/workflows/php-qa.yml
index 3bf57e2..8cf444a 100644
--- a/.github/workflows/php-qa.yml
+++ b/.github/workflows/php-qa.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php-ver: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+        php-ver: [ '7.4', '8.0', '8.1', '8.2' ]
         deps-mode: [ 'lowest', 'highest' ]
         include:
           - php-ver: '8.1'

From 6e07ab6bf406750189abaff2fb2949ae6e794f3d Mon Sep 17 00:00:00 2001
From: Antonio Mangiacapra <11173091+antonioeatgoat@users.noreply.github.com>
Date: Fri, 25 Aug 2023 14:47:35 +0200
Subject: [PATCH 09/18] Add DependaBot configuration file

---
 dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 dependabot.yml

diff --git a/dependabot.yml b/dependabot.yml
new file mode 100644
index 0000000..12f28b4
--- /dev/null
+++ b/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "daily"
\ No newline at end of file

From 75addb1fa312af949a1ad145896bcc3620868d9f Mon Sep 17 00:00:00 2001
From: Antonio Mangiacapra <11173091+antonioeatgoat@users.noreply.github.com>
Date: Fri, 25 Aug 2023 16:29:36 +0200
Subject: [PATCH 10/18] Change branch for `automattic/vipwpcs`

The feature branch we were using has been merged.
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7644e18..659eea2 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "php": ">=7.4",
         "squizlabs/php_codesniffer": "^3.6.0",
         "dealerdirect/phpcodesniffer-composer-installer": "~1.0.0",
-        "automattic/vipwpcs": "dev-3.0/updates-for-wpcs-3.0",
+        "automattic/vipwpcs": "dev-develop",
         "phpcompatibility/php-compatibility": "^9.3.5",
         "automattic/phpcs-neutron-standard": "^1.6.0"
     },

From 8b10e496f3648650d8f8d5be557bc83a70a3d3bf Mon Sep 17 00:00:00 2001
From: Giuseppe Mazzapica <giuseppe.mazzapica@gmail.com>
Date: Sat, 26 Aug 2023 00:25:23 +0200
Subject: [PATCH 11/18] Improve dependdencies to reduce conflicts

---
 composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 659eea2..c9f45d1 100644
--- a/composer.json
+++ b/composer.json
@@ -30,11 +30,10 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=7.4",
-        "squizlabs/php_codesniffer": "^3.6.0",
         "dealerdirect/phpcodesniffer-composer-installer": "~1.0.0",
         "automattic/vipwpcs": "dev-develop",
         "phpcompatibility/php-compatibility": "^9.3.5",
-        "automattic/phpcs-neutron-standard": "^1.6.0"
+        "automattic/phpcs-neutron-standard": "^v1.7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.5.0 || ~9.5.0",

From 63d7feb5403493745a4aff628afef4044167fee4 Mon Sep 17 00:00:00 2001
From: Giuseppe Mazzapica <giuseppe.mazzapica@gmail.com>
Date: Sat, 26 Aug 2023 00:26:28 +0200
Subject: [PATCH 12/18] Update dev dependencies

---
 composer.json | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index c9f45d1..909ae1b 100644
--- a/composer.json
+++ b/composer.json
@@ -36,8 +36,8 @@
         "automattic/phpcs-neutron-standard": "^v1.7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.5.0 || ~9.5.0",
-        "vimeo/psalm": "@stable"
+        "phpunit/phpunit": "^9.6.11",
+        "vimeo/psalm": "^5.15.0"
     },
     "autoload-dev": {
         "psr-4": {
@@ -54,13 +54,11 @@
     },
     "scripts" : {
         "cs": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs",
-        "phpcompat": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs -p . --standard=PHPCompatibility --ignore=*/vendor/*,*tests/fixtures/* --extensions=php --basepath=./ --runtime-set testVersion 7.0-",
         "tests": "@php ./vendor/phpunit/phpunit/phpunit",
         "tests:no-cov": "@php ./vendor/phpunit/phpunit/phpunit --no-coverage",
-        "psalm": "@php ./vendor/vimeo/psalm/psalm --no-cache",
+        "psalm": "@php ./vendor/vimeo/psalm/psalm --no-suggestions --report-show-info=false --find-unused-psalm-suppress --no-diff --no-cache --no-file-cache --output-format=compact",
         "qa": [
             "@cs",
-            "@phpcompat",
             "@tests:no-cov",
             "@psalm"
         ]

From f80704818fdbab78f94f4c4f47e17b734be043f7 Mon Sep 17 00:00:00 2001
From: Giuseppe Mazzapica <giuseppe.mazzapica@gmail.com>
Date: Sat, 26 Aug 2023 00:28:14 +0200
Subject: [PATCH 13/18] Fix tests and coding standards for updated deps

---
 .gitignore                                    |   7 --
 Inpsyde/PhpcsHelpers.php                      |  17 +--
 .../ArgumentTypeDeclarationSniff.php          |  75 +++++++-----
 .../CodeQuality/ConstantVisibilitySniff.php   |  42 -------
 .../CodeQuality/DisallowShortOpenTagSniff.php |  10 +-
 .../ElementNameMinimalLengthSniff.php         |  39 ++----
 .../ForbiddenPublicPropertySniff.php          |  30 ++---
 .../CodeQuality/FunctionBodyStartSniff.php    |  36 +++---
 .../CodeQuality/FunctionLengthSniff.php       |  50 ++------
 .../CodeQuality/HookClosureReturnSniff.php    |  36 +++---
 .../Sniffs/CodeQuality/LineLengthSniff.php    |  63 ++++------
 .../Sniffs/CodeQuality/NestingLevelSniff.php  |  53 +++------
 .../Sniffs/CodeQuality/NoAccessorsSniff.php   |  49 +++-----
 Inpsyde/Sniffs/CodeQuality/NoElseSniff.php    |  22 ++--
 .../CodeQuality/NoTopLevelDefineSniff.php     |  30 ++---
 .../PropertyPerClassLimitSniff.php            |  33 ++----
 Inpsyde/Sniffs/CodeQuality/Psr4Sniff.php      |  58 ++++-----
 .../ReturnTypeDeclarationSniff.php            |  56 ++++-----
 .../Sniffs/CodeQuality/StaticClosureSniff.php |  34 ++----
 .../Sniffs/CodeQuality/VariablesNameSniff.php |  69 +++--------
 Inpsyde/ruleset.xml                           |   1 -
 phpcs.xml                                     |  73 +-----------
 phpunit.xml.dist                              |  36 +++---
 psalm.xml                                     |   6 +-
 tests/bootstrap.php                           |  37 ++++--
 tests/cases/FixturesTest.php                  |  44 ++++---
 tests/cases/PhpcsHelpersTest.php              |  37 +++---
 tests/src/FixtureContentParser.php            | 112 +++++++++---------
 tests/src/SniffMessages.php                   |  40 ++-----
 tests/src/SniffMessagesExtractor.php          |  14 +--
 30 files changed, 442 insertions(+), 767 deletions(-)
 delete mode 100644 Inpsyde/Sniffs/CodeQuality/ConstantVisibilitySniff.php

diff --git a/.gitignore b/.gitignore
index 8a6f193..88f6304 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,11 +2,4 @@ composer.phar
 composer.lock
 /vendor/
 /phpunit.xml
-
-# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
-# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-# composer.lock
-.buildpath
-.project
-.settings/
 .phpunit.result.cache
diff --git a/Inpsyde/PhpcsHelpers.php b/Inpsyde/PhpcsHelpers.php
index fc6bd50..9bcd6c4 100644
--- a/Inpsyde/PhpcsHelpers.php
+++ b/Inpsyde/PhpcsHelpers.php
@@ -119,13 +119,14 @@ public static function findOopContext(File $file, int $position): int
         $targetLevel = (int)$tokens[$position]['level'] - 1;
 
         foreach ($tokens[$position]['conditions'] as $condPosition => $condCode) {
+            assert(is_int($condPosition));
             $condLevel = (int)($tokens[$condPosition]['level'] ?? -1);
 
             if (
                 in_array($condCode, Tokens::$ooScopeTokens, true)
                 && ($condLevel === $targetLevel)
             ) {
-                return (int)$condPosition;
+                return $condPosition;
             }
         }
 
@@ -387,7 +388,7 @@ public static function functionDocBlockTags(
         $normalizedTags = [];
         static $rand;
         $rand or $rand = bin2hex(random_bytes(3));
-        foreach ($tags as list($tagName, $tagContent)) {
+        foreach ($tags as [$tagName, $tagContent]) {
             empty($normalizedTags[$tagName]) and $normalizedTags[$tagName] = [];
             if (!$normalizeContent) {
                 $normalizedTags[$tagName][] = $tagContent;
@@ -433,7 +434,7 @@ public static function functionDocBlockParamTypes(File $file, int $functionPosit
 
         $types = [];
         foreach ($params as $param) {
-            preg_match('~^([^$]+)\s*(\$(?:[^\s]+))~', trim($param), $matches);
+            preg_match('~^([^$]+)\s*(\$\S+)~', trim($param), $matches);
             if (empty($matches[1]) || empty($matches[2])) {
                 continue;
             }
@@ -461,7 +462,7 @@ public static function isHookFunction(File $file, int $position): bool
      */
     public static function functionBody(File $file, int $position): string
     {
-        list($start, $end) = static::functionBoundaries($file, $position);
+        [$start, $end] = static::functionBoundaries($file, $position);
         if ($start < 0 || $end < 0) {
             return '';
         }
@@ -470,7 +471,7 @@ public static function functionBody(File $file, int $position): string
         $tokens = $file->getTokens();
         $body = '';
         for ($i = $start + 1; $i < $end; $i++) {
-            $body .= (string)$tokens[$i]['content'];
+            $body .= (string)($tokens[$i]['content'] ?? '');
         }
 
         return $body;
@@ -531,7 +532,7 @@ public static function returnsCountInfo(File $file, int $position): array
     {
         $returnCount = ['nonEmpty' => 0, 'void' => 0, 'null' => 0, 'total' => 0];
 
-        list($start, $end) = self::functionBoundaries($file, $position);
+        [$start, $end] = self::functionBoundaries($file, $position);
         if ($start < 0 || $end <= 0) {
             return $returnCount;
         }
@@ -541,8 +542,8 @@ public static function returnsCountInfo(File $file, int $position): array
 
         $pos = $start + 1;
         while ($pos < $end) {
-            list(, $innerFunctionEnd) = self::functionBoundaries($file, $pos);
-            list(, $innerClassEnd) = self::classBoundaries($file, $pos);
+            [, $innerFunctionEnd] = self::functionBoundaries($file, $pos);
+            [, $innerClassEnd] = self::classBoundaries($file, $pos);
             if ($innerFunctionEnd > 0 || $innerClassEnd > 0) {
                 $pos = ($innerFunctionEnd > 0) ? $innerFunctionEnd + 1 : $innerClassEnd + 1;
                 continue;
diff --git a/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php b/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php
index c715c6d..2a19d85 100644
--- a/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php
@@ -19,65 +19,54 @@
 
 class ArgumentTypeDeclarationSniff implements Sniff
 {
-    const TYPE_CODES = [
+    public const TYPE_CODES = [
         T_STRING,
         T_ARRAY_HINT,
         T_CALLABLE,
         T_SELF,
     ];
 
-    const METHODS_WHITELIST = [
+    public const METHODS_WHITELIST = [
         'unserialize',
         'seek',
     ];
 
     /**
-     * @return array<int|string>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int|string>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_FUNCTION, T_CLOSURE];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
-     * phpcs:disable Inpsyde.CodeQuality
+     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
+     * phpcs:disable Generic.Metrics.CyclomaticComplexity
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
-        // phpcs:enable Inpsyde.CodeQuality
+        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
+        // phpcs:enable Generic.Metrics.CyclomaticComplexity
 
-        if (
-            PhpcsHelpers::functionIsArrayAccess($file, $position)
-            || PhpcsHelpers::isHookClosure($file, $position)
-            || PhpcsHelpers::isHookFunction($file, $position)
-            || PhpcsHelpers::isUntypedPsrMethod($file, $position)
-            || (
-                PhpcsHelpers::functionIsMethod($file, $position)
-                && in_array($file->getDeclarationName($position), self::METHODS_WHITELIST, true)
-            )
-        ) {
+        if ($this->shouldIgnore($phpcsFile, $stackPtr)) {
             return;
         }
 
         /** @var array<int, array<string, mixed>> $tokens */
-        $tokens = $file->getTokens();
-        $paramsStart = (int)($tokens[$position]['parenthesis_opener'] ?? 0);
-        $paramsEnd = (int)($tokens[$position]['parenthesis_closer'] ?? 0);
+        $tokens = $phpcsFile->getTokens();
+        $paramsStart = (int)($tokens[$stackPtr]['parenthesis_opener'] ?? 0);
+        $paramsEnd = (int)($tokens[$stackPtr]['parenthesis_closer'] ?? 0);
 
         if (!$paramsStart || !$paramsEnd || $paramsStart >= ($paramsEnd - 1)) {
             return;
         }
 
-        $docBlockTypes = PhpcsHelpers::functionDocBlockParamTypes($file, $position);
-        $variables = PhpcsHelpers::filterTokensByType($paramsStart, $paramsEnd, $file, T_VARIABLE);
+        $docBlockTypes = PhpcsHelpers::functionDocBlockParamTypes($phpcsFile, $stackPtr);
+        $variables = PhpcsHelpers::filterTokensByType($paramsStart, $paramsEnd, $phpcsFile, T_VARIABLE);
 
         foreach ($variables as $varPosition => $varToken) {
             // Not triggering error for variable explicitly declared as mixed (or mixed|null)
@@ -85,7 +74,7 @@ public function process(File $file, $position)
                 continue;
             }
 
-            $typePosition = $file->findPrevious(
+            $typePosition = $phpcsFile->findPrevious(
                 [T_WHITESPACE, T_ELLIPSIS, T_BITWISE_AND],
                 $varPosition - 1,
                 $paramsStart + 1,
@@ -93,13 +82,35 @@ public function process(File $file, $position)
             );
 
             $type = $tokens[$typePosition] ?? null;
-            /** @psalm-suppress MixedArgument */
-            if ($type && !in_array($type['code'], self::TYPE_CODES, true)) {
-                $file->addWarning('Argument type is missing', $position, 'NoArgumentType');
+            if ($type && !in_array($type['code'] ?? '', self::TYPE_CODES, true)) {
+                $phpcsFile->addWarning('Argument type is missing', $stackPtr, 'NoArgumentType');
             }
         }
     }
 
+    /**
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return bool
+     *
+     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
+     */
+    private function shouldIgnore(File $phpcsFile, $stackPtr): bool
+    {
+        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
+
+        $name = $phpcsFile->getDeclarationName($stackPtr);
+
+        return PhpcsHelpers::functionIsArrayAccess($phpcsFile, $stackPtr)
+            || PhpcsHelpers::isHookClosure($phpcsFile, $stackPtr)
+            || PhpcsHelpers::isHookFunction($phpcsFile, $stackPtr)
+            || PhpcsHelpers::isUntypedPsrMethod($phpcsFile, $stackPtr)
+            || (
+                PhpcsHelpers::functionIsMethod($phpcsFile, $stackPtr)
+                && in_array($name, self::METHODS_WHITELIST, true)
+            );
+    }
+
     /**
      * @param string $paramName
      * @param array<string, array<string>> $docBlockTypes
diff --git a/Inpsyde/Sniffs/CodeQuality/ConstantVisibilitySniff.php b/Inpsyde/Sniffs/CodeQuality/ConstantVisibilitySniff.php
deleted file mode 100644
index 0a178e5..0000000
--- a/Inpsyde/Sniffs/CodeQuality/ConstantVisibilitySniff.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of the php-coding-standards package.
- *
- * (c) Inpsyde GmbH
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Inpsyde\Sniffs\CodeQuality;
-
-use Inpsyde\PhpcsHelpers;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Standards\PSR12\Sniffs\Properties as PSR12;
-
-final class ConstantVisibilitySniff extends PSR12\ConstantVisibilitySniff
-{
-    /**
-     * @param File $file
-     * @param int $position
-     * @return void
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
-     */
-    public function process(File $file, $position)
-    {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
-        $min = PhpcsHelpers::minPhpTestVersion();
-        if ($min && version_compare($min, '7.1', '<')) {
-            return;
-        }
-
-        parent::process($file, $position);
-    }
-}
diff --git a/Inpsyde/Sniffs/CodeQuality/DisallowShortOpenTagSniff.php b/Inpsyde/Sniffs/CodeQuality/DisallowShortOpenTagSniff.php
index 23bfbbf..72f3e81 100644
--- a/Inpsyde/Sniffs/CodeQuality/DisallowShortOpenTagSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/DisallowShortOpenTagSniff.php
@@ -18,16 +18,10 @@
 class DisallowShortOpenTagSniff extends Generic\DisallowShortOpenTagSniff
 {
     /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_OPEN_TAG, T_INLINE_HTML];
     }
 }
diff --git a/Inpsyde/Sniffs/CodeQuality/ElementNameMinimalLengthSniff.php b/Inpsyde/Sniffs/CodeQuality/ElementNameMinimalLengthSniff.php
index d425a59..4c28d0a 100644
--- a/Inpsyde/Sniffs/CodeQuality/ElementNameMinimalLengthSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/ElementNameMinimalLengthSniff.php
@@ -10,15 +10,12 @@
 
 class ElementNameMinimalLengthSniff implements Sniff
 {
-    /**
-     * @var int
-     */
-    public $minLength = 3;
+    public int $minLength = 3;
 
     /**
-     * @var string[]
+     * @var list<string>
      */
-    public $allowedShortNames = [
+    public array $allowedShortNames = [
         'as',
         'at',
         'be',
@@ -45,46 +42,36 @@ class ElementNameMinimalLengthSniff implements Sniff
         'wp',
     ];
 
-    /**
-     * @var string[]
-     */
-    public $additionalAllowedNames = [];
+    /** @var list<string> */
+    public array $additionalAllowedNames = [];
 
     /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_CLASS, T_TRAIT, T_INTERFACE, T_CONST, T_FUNCTION, T_VARIABLE];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
-        $elementName = PhpcsHelpers::tokenName($file, $position);
+        $elementName = PhpcsHelpers::tokenName($phpcsFile, $stackPtr);
         $elementNameLength = mb_strlen($elementName);
 
         if ($this->shouldBeSkipped($elementNameLength, $elementName)) {
             return;
         }
 
-        $typeName = PhpcsHelpers::tokenTypeName($file, $position);
+        $typeName = PhpcsHelpers::tokenTypeName($phpcsFile, $stackPtr);
         $message = sprintf(
             '%s name "%s" is only %d chars long. Must be at least %d.',
             $typeName,
@@ -93,7 +80,7 @@ public function process(File $file, $position)
             $this->minLength
         );
 
-        $file->addError($message, $position, 'TooShort');
+        $phpcsFile->addError($message, $stackPtr, 'TooShort');
     }
 
     /**
diff --git a/Inpsyde/Sniffs/CodeQuality/ForbiddenPublicPropertySniff.php b/Inpsyde/Sniffs/CodeQuality/ForbiddenPublicPropertySniff.php
index 510654f..04a3365 100644
--- a/Inpsyde/Sniffs/CodeQuality/ForbiddenPublicPropertySniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/ForbiddenPublicPropertySniff.php
@@ -12,46 +12,38 @@
 class ForbiddenPublicPropertySniff implements Sniff
 {
     /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_VARIABLE];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
-        if (!PhpcsHelpers::variableIsProperty($file, $position)) {
+        if (!PhpcsHelpers::variableIsProperty($phpcsFile, $stackPtr)) {
             return;
         }
 
         // Skip sniff classes, they have public properties for configuration (unfortunately)
-        if ($this->isSniffClass($file, $position)) {
+        if ($this->isSniffClass($phpcsFile, $stackPtr)) {
             return;
         }
 
-        $scopeModifierToken = $this->propertyScopeModifier($file, $position);
+        $scopeModifierToken = $this->propertyScopeModifier($phpcsFile, $stackPtr);
         if ($scopeModifierToken['code'] === T_PUBLIC) {
-            $file->addError(
+            $phpcsFile->addError(
                 'Do not use public properties. Use method access instead.',
-                $position,
+                $stackPtr,
                 'Found'
             );
         }
@@ -87,7 +79,7 @@ private function isSniffClass(File $file, int $position): bool
     /**
      * @param File $file
      * @param int $position
-     * @return array
+     * @return array<string, mixed>
      */
     private function propertyScopeModifier(File $file, int $position): array
     {
diff --git a/Inpsyde/Sniffs/CodeQuality/FunctionBodyStartSniff.php b/Inpsyde/Sniffs/CodeQuality/FunctionBodyStartSniff.php
index 83ff8d5..885e11b 100644
--- a/Inpsyde/Sniffs/CodeQuality/FunctionBodyStartSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/FunctionBodyStartSniff.php
@@ -11,35 +11,27 @@
 class FunctionBodyStartSniff implements Sniff
 {
     /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_FUNCTION];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
         /** @var array<int, array<string, mixed>> $tokens */
-        $tokens = $file->getTokens();
-        $token = $tokens[$position] ?? [];
+        $tokens = $phpcsFile->getTokens();
+        $token = $tokens[$stackPtr] ?? [];
 
         $scopeOpener = (int)($token['scope_opener'] ?? -1);
         $scopeCloser = (int)($token['scope_closer'] ?? -1);
@@ -48,7 +40,7 @@ public function process(File $file, $position)
             return;
         }
 
-        $bodyStart = $file->findNext([T_WHITESPACE], $scopeOpener + 1, null, true);
+        $bodyStart = $phpcsFile->findNext([T_WHITESPACE], $scopeOpener + 1, null, true);
         if (
             !$bodyStart
             || !array_key_exists($bodyStart, $tokens)
@@ -58,20 +50,20 @@ public function process(File $file, $position)
             return;
         }
 
-        list($code, $message, $expectedLine) = $this->checkBodyStart(
+        [$code, $message, $expectedLine] = $this->checkBodyStart(
             $bodyStart,
             (int)($tokens[$scopeOpener]['line'] ?? -1),
             (int)($token['line'] ?? -1),
-            $file
+            $phpcsFile
         );
 
         if (
             $code
             && $message
             && $expectedLine
-            && $file->addFixableWarning($message, $position, $code)
+            && $phpcsFile->addFixableWarning($message, $stackPtr, $code)
         ) {
-            $this->fix($bodyStart, $expectedLine, $scopeOpener, $file);
+            $this->fix($bodyStart, $expectedLine, $scopeOpener, $phpcsFile);
         }
     }
 
@@ -80,7 +72,7 @@ public function process(File $file, $position)
      * @param int $openerLine
      * @param int $functionLine
      * @param File $file
-     * @return array{null, null, null}|array{string, string, int}
+     * @return list{null, null, null}|list{string, string, int}
      */
     private function checkBodyStart(
         int $bodyStart,
@@ -143,7 +135,7 @@ private function checkBodyStart(
      * @param File $file
      * @return void
      */
-    private function fix(int $bodyStart, int $expectedLine, int $scopeOpener, File $file)
+    private function fix(int $bodyStart, int $expectedLine, int $scopeOpener, File $file): void
     {
         /** @var array<int, array<string, mixed>> $tokens */
         $tokens = $file->getTokens();
diff --git a/Inpsyde/Sniffs/CodeQuality/FunctionLengthSniff.php b/Inpsyde/Sniffs/CodeQuality/FunctionLengthSniff.php
index 0181d77..b807d8e 100644
--- a/Inpsyde/Sniffs/CodeQuality/FunctionLengthSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/FunctionLengthSniff.php
@@ -9,57 +9,31 @@
 
 class FunctionLengthSniff implements Sniff
 {
-    /**
-     * @var mixed
-     */
-    public $maxLength = 50;
-
-    /**
-     * @var mixed
-     */
-    public $ignoreDocBlocks = true;
-
-    /**
-     * @var mixed
-     */
-    public $ignoreComments = true;
-
-    /**
-     * @var mixed
-     */
-    public $ignoreBlankLines = true;
+    public int $maxLength = 50;
+    public bool $ignoreDocBlocks = true;
+    public bool $ignoreComments = true;
+    public bool $ignoreBlankLines = true;
 
     /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_FUNCTION];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
-        is_numeric($this->maxLength) or $this->maxLength = 50;
-        $this->maxLength = (int)$this->maxLength;
 
-        $length = $this->structureLinesCount($file, $position);
+        $length = $this->structureLinesCount($phpcsFile, $stackPtr);
         if ($length <= $this->maxLength) {
             return;
         }
@@ -84,7 +58,7 @@ public function process(File $file, $position)
             $this->maxLength
         );
 
-        $file->addError($error, $position, 'TooLong');
+        $phpcsFile->addError($error, $stackPtr, 'TooLong');
     }
 
     /**
@@ -200,7 +174,7 @@ private function docBlocksData(array $tokens, int $position, array $docBlocks):
     /**
      * @return void
      */
-    private function normalizeIgnoreFlags()
+    private function normalizeIgnoreFlags(): void
     {
         $flags = [
             'ignoreBlankLines',
diff --git a/Inpsyde/Sniffs/CodeQuality/HookClosureReturnSniff.php b/Inpsyde/Sniffs/CodeQuality/HookClosureReturnSniff.php
index ba0cacb..73159e7 100644
--- a/Inpsyde/Sniffs/CodeQuality/HookClosureReturnSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/HookClosureReturnSniff.php
@@ -11,42 +11,34 @@
 class HookClosureReturnSniff implements Sniff
 {
     /**
-     * @return array<string>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<string>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_CLOSURE];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
-        if (!PhpcsHelpers::isHookClosure($file, $position)) {
+        if (!PhpcsHelpers::isHookClosure($phpcsFile, $stackPtr)) {
             return;
         }
 
-        list($functionStart, $functionEnd) = PhpcsHelpers::functionBoundaries($file, $position);
+        [$functionStart, $functionEnd] = PhpcsHelpers::functionBoundaries($phpcsFile, $stackPtr);
         if ($functionStart < 0 || $functionEnd <= 0) {
             return;
         }
 
-        $returnData = PhpcsHelpers::returnsCountInfo($file, $position);
+        $returnData = PhpcsHelpers::returnsCountInfo($phpcsFile, $stackPtr);
         $nonVoidReturnCount = $returnData['nonEmpty'];
         $voidReturnCount = $returnData['void'];
         $nullReturnsCount = $returnData['null'];
@@ -54,18 +46,22 @@ public function process(File $file, $position)
         // Allow a filter to return null on purpose
         $nonVoidReturnCount += $nullReturnsCount;
 
-        $isFilterClosure = PhpcsHelpers::isHookClosure($file, $position, true, false);
+        $isFilterClosure = PhpcsHelpers::isHookClosure($phpcsFile, $stackPtr, true, false);
 
         if ($isFilterClosure && (!$nonVoidReturnCount || $voidReturnCount)) {
-            $file->addError(
+            $phpcsFile->addError(
                 'No (or void) return from filter closure.',
-                $position,
+                $stackPtr,
                 'NoReturnFromFilter'
             );
         }
 
         if (!$isFilterClosure && $nonVoidReturnCount) {
-            $file->addError('Return value from action closure.', $position, 'ReturnFromAction');
+            $phpcsFile->addError(
+                'Return value from action closure.',
+                $stackPtr,
+                'ReturnFromAction'
+            );
         }
     }
 }
diff --git a/Inpsyde/Sniffs/CodeQuality/LineLengthSniff.php b/Inpsyde/Sniffs/CodeQuality/LineLengthSniff.php
index 7027bee..0473033 100644
--- a/Inpsyde/Sniffs/CodeQuality/LineLengthSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/LineLengthSniff.php
@@ -10,7 +10,7 @@
 
 class LineLengthSniff implements Sniff
 {
-    const I18N_FUNCTIONS = [
+    public const I18N_FUNCTIONS = [
         '__',
         '_e',
         '_x',
@@ -29,58 +29,47 @@ class LineLengthSniff implements Sniff
 
     /**
      * The limit that the length of a line should not exceed.
-     *
-     * @var integer
      */
-    public $lineLimit = 100;
+    public int $lineLimit = 100;
 
     /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_OPEN_TAG];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return int
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): int
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
-        $longLinesData = $this->collectLongLinesData($file, max(1, $position));
+        $longLinesData = $this->collectLongLinesData($phpcsFile, max(1, $stackPtr));
         if (!$longLinesData) {
-            return $file->numTokens + 1;
+            return $phpcsFile->numTokens + 1;
         }
 
-        foreach ($longLinesData as $lineNum => list($length, $position)) {
-            $file->addWarning(
+        foreach ($longLinesData as $lineNum => [$length, $stackPtr]) {
+            $phpcsFile->addWarning(
                 sprintf(
                     'Line %d exceeds %s characters; contains %s characters.',
                     $lineNum,
                     $this->lineLimit,
                     $length
                 ),
-                $position,
+                $stackPtr,
                 'TooLong'
             );
         }
-        // phpcs:enable
 
-        return $file->numTokens + 1;
+        return $phpcsFile->numTokens + 1;
     }
 
     /**
@@ -93,31 +82,27 @@ private function collectLongLinesData(File $file, int $start): array
         /** @var array<int, array<string, mixed>> $tokens */
         $tokens = $file->getTokens();
 
-        /** @var array<
-         *  int,
-         *  array{length:int, nonEmptyLength:int, start:int, end:int|null}
-         * > $linesData
-         */
-        $linesData = [];
+        /** @var array<int, array{length:int, nonEmptyLength:int, start:int, end:int|null}> $data */
+        $data = [];
         /** @var int|null $lastLine */
         $lastLine = null;
         for ($i = $start; $i < $file->numTokens; $i++) {
             // Still processing previous line: increment length and continue.
             if ($lastLine && ($tokens[$i]['line'] === $lastLine)) {
                 $content = (string)$tokens[$i]['content'];
-                $linesData[$lastLine]['length'] += strlen($content);
-                $linesData[$lastLine]['nonEmptyLength'] += strlen(trim($content));
+                $data[$lastLine]['length'] += strlen($content);
+                $data[$lastLine]['nonEmptyLength'] += strlen(trim($content));
                 continue;
             }
 
             // A new line started: let's set "end" for the previous line (if this isn't 1st line)
-            if ($lastLine && isset($linesData[$lastLine])) {
-                $linesData[$lastLine]['end'] = $i - 1;
+            if ($lastLine && isset($data[$lastLine])) {
+                $data[$lastLine]['end'] = $i - 1;
             }
 
             $lastLine = (int)$tokens[$i]['line'];
             $content = (string)$tokens[$i]['content'];
-            $linesData[$lastLine] = [
+            $data[$lastLine] = [
                 'length' => strlen($content),
                 'nonEmptyLength' => strlen(trim($content)),
                 'start' => $i,
@@ -126,12 +111,12 @@ private function collectLongLinesData(File $file, int $start): array
         }
 
         // We still have to set the "end" for last file line.
-        if ($lastLine && ($linesData[$lastLine]['end'] === null)) {
-            $linesData[$lastLine]['end'] = $i - 1;
+        if ($lastLine && ($data[$lastLine]['end'] === null)) {
+            $data[$lastLine]['end'] = $i - 1;
         }
 
         $longLines = [];
-        foreach ($linesData as $lineNumber => $lineData) {
+        foreach ($data as $lineNumber => $lineData) {
             $lineEnd = $lineData['end'] ?? $lineData['start'];
             if (
                 (($lineData['length'] - $this->lineLimit) <= 1) // 1 char of tolerance
@@ -228,7 +213,7 @@ private function isLongHtmlAttribute(
         }
 
         // Instead of counting single _word_ length we will count single _attribute_ length
-        preg_match_all('~[^\s]+\s*=\s*["\'][^"\']*["\']~', $content, $matches);
+        preg_match_all('~\S+\s*=\s*["\'][^"\']*["\']~', $content, $matches);
         /** @var non-empty-array<int, array> $matches */
         $attributesNumber = count($matches[0]);
 
diff --git a/Inpsyde/Sniffs/CodeQuality/NestingLevelSniff.php b/Inpsyde/Sniffs/CodeQuality/NestingLevelSniff.php
index 23ca2dd..9e386c7 100644
--- a/Inpsyde/Sniffs/CodeQuality/NestingLevelSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/NestingLevelSniff.php
@@ -9,60 +9,41 @@
 
 class NestingLevelSniff implements Sniff
 {
-    /**
-     * @var mixed
-     */
-    public $warningLimit = 3;
-
-    /**
-     * @var mixed
-     */
-    public $errorLimit = 5;
-
-    /**
-     * @var mixed
-     */
-    public $ignoreTopLevelTryBlock = true;
+    public int $warningLimit = 3;
+    public int $errorLimit = 5;
+    public bool $ignoreTopLevelTryBlock = true;
 
     /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_FUNCTION];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
         /** @var array<int, array<string, mixed>> $tokens */
-        $tokens = $file->getTokens();
+        $tokens = $phpcsFile->getTokens();
 
         // Ignore abstract methods.
-        if (isset($tokens[$position]['scope_opener']) === false) {
+        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
             return;
         }
 
-        $start = (int)$tokens[$position]['scope_opener'];
-        $end = (int)$tokens[$position]['scope_closer'];
+        $start = (int)$tokens[$stackPtr]['scope_opener'];
+        $end = (int)$tokens[$stackPtr]['scope_closer'];
 
-        $baseLevel = (int)$tokens[$position]['level'];
+        $baseLevel = (int)$tokens[$stackPtr]['level'];
         $nestingLevel = 0;
         $inTry = false;
         $endTry = null;
@@ -90,7 +71,7 @@ public function process(File $file, $position)
                 && ($tokens[$i]['code'] === T_CATCH || $tokens[$i]['code'] === T_FINALLY)
                 && $level === $tryTargetLevel
             ) {
-                $endTry = $this->endOfTryBlock($i, $file);
+                $endTry = $this->endOfTryBlock($i, $phpcsFile);
                 continue;
             }
 
@@ -106,16 +87,16 @@ public function process(File $file, $position)
         // We subtract the nesting level of the function itself .
         $nestingLevel -= ($baseLevel + 1);
 
-        $this->maybeTrigger($nestingLevel, $file, $position);
+        $this->maybeTrigger($nestingLevel, $phpcsFile, $stackPtr);
     }
 
     /**
      * @param int $nestingLevel
-     * @param File $file
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @return void
      */
-    private function maybeTrigger(int $nestingLevel, File $phpcsFile, int $stackPtr)
+    private function maybeTrigger(int $nestingLevel, File $phpcsFile, int $stackPtr): void
     {
         $isError = $nestingLevel >= $this->errorLimit;
         $isWarning = !$isError && ($nestingLevel >= $this->warningLimit);
diff --git a/Inpsyde/Sniffs/CodeQuality/NoAccessorsSniff.php b/Inpsyde/Sniffs/CodeQuality/NoAccessorsSniff.php
index 2123903..b7e93f5 100644
--- a/Inpsyde/Sniffs/CodeQuality/NoAccessorsSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/NoAccessorsSniff.php
@@ -11,66 +11,51 @@
 
 class NoAccessorsSniff implements Sniff
 {
-    const ALLOWED_NAMES = [
+    public const ALLOWED_NAMES = [
         'getIterator',
         'getInnerIterator',
         'getChildren',
         'setUp',
     ];
 
-    /**
-     * @var bool
-     */
-    public $skipForPrivate = true;
+    public bool $skipForPrivate = true;
+    public bool $skipForProtected = false;
 
     /**
-     * @var bool
+     * @return list<int>
      */
-    public $skipForProtected = false;
-
-    /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
-     */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_FUNCTION];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      * phpcs:disable Inpsyde.CodeQuality.FunctionLength
      * phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
         // phpcs:enable Inpsyde.CodeQuality.FunctionLength
 
-        if (!PhpcsHelpers::functionIsMethod($file, $position)) {
+        if (!PhpcsHelpers::functionIsMethod($phpcsFile, $stackPtr)) {
             return;
         }
 
-        $functionName = $file->getDeclarationName($position);
+        $functionName = $phpcsFile->getDeclarationName($stackPtr);
         if (!$functionName || in_array($functionName, self::ALLOWED_NAMES, true)) {
             return;
         }
 
         if ($this->skipForPrivate || $this->skipForProtected) {
-            $modifierPointerPosition = $file->findPrevious(
+            $modifierPointerPosition = $phpcsFile->findPrevious(
                 [T_WHITESPACE, T_ABSTRACT],
-                $position - 1,
+                $stackPtr - 1,
                 null,
                 true,
                 null,
@@ -78,7 +63,7 @@ public function process(File $file, $position)
             );
 
             /** @var array<int, array<string, mixed>> $tokens */
-            $tokens = $file->getTokens();
+            $tokens = $phpcsFile->getTokens();
             $modifierPointer = $tokens[$modifierPointerPosition] ?? null;
             if (
                 $modifierPointer
@@ -102,22 +87,22 @@ public function process(File $file, $position)
         }
 
         if ($matches[1] === 'set') {
-            $file->addWarning(
+            $phpcsFile->addWarning(
                 'Setters are discouraged. Try to use immutable objects, constructor injection '
                 . 'and for objects that really needs changing state try behavior naming instead, '
                 . 'e.g. changeName() instead of setName().',
-                $position,
+                $stackPtr,
                 'NoSetter'
             );
 
             return;
         }
 
-        $file->addWarning(
+        $phpcsFile->addWarning(
             'Getters are discouraged. "Tell Don\'t Ask" principle should be applied if possible, '
             . 'and if getters are really needed consider naming methods after properties, '
             . 'e.g. id() instead of getId().',
-            $position,
+            $stackPtr,
             'NoGetter'
         );
     }
diff --git a/Inpsyde/Sniffs/CodeQuality/NoElseSniff.php b/Inpsyde/Sniffs/CodeQuality/NoElseSniff.php
index ca5ae8c..83cb06a 100644
--- a/Inpsyde/Sniffs/CodeQuality/NoElseSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/NoElseSniff.php
@@ -10,35 +10,27 @@
 class NoElseSniff implements Sniff
 {
     /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_ELSE];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
-        $file->addWarning(
+        $phpcsFile->addWarning(
             'Do not use "else". Prefer early return statement instead.',
-            $position,
+            $stackPtr,
             'ElseFound'
         );
     }
diff --git a/Inpsyde/Sniffs/CodeQuality/NoTopLevelDefineSniff.php b/Inpsyde/Sniffs/CodeQuality/NoTopLevelDefineSniff.php
index 9d33ed7..760bc01 100644
--- a/Inpsyde/Sniffs/CodeQuality/NoTopLevelDefineSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/NoTopLevelDefineSniff.php
@@ -11,46 +11,38 @@
 class NoTopLevelDefineSniff implements Sniff
 {
     /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_STRING];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
         /** @var array<int, array<string, mixed>> $tokens */
-        $tokens = $file->getTokens();
+        $tokens = $phpcsFile->getTokens();
 
         if (
-            ($tokens[$position]['content'] ?? '') !== 'define'
-            || ($tokens[$position]['level'] ?? -1) !== 0
-            || !PhpcsHelpers::looksLikeFunctionCall($file, $position)
+            ($tokens[$stackPtr]['content'] ?? '') !== 'define'
+            || ($tokens[$stackPtr]['level'] ?? -1) !== 0
+            || !PhpcsHelpers::looksLikeFunctionCall($phpcsFile, $stackPtr)
         ) {
             return;
         }
 
-        $file->addWarning(
+        $phpcsFile->addWarning(
             'Do not use "define" for top-level constant definition. Prefer "const" instead.',
-            $position,
+            $stackPtr,
             'Found'
         );
     }
diff --git a/Inpsyde/Sniffs/CodeQuality/PropertyPerClassLimitSniff.php b/Inpsyde/Sniffs/CodeQuality/PropertyPerClassLimitSniff.php
index eed812f..79eb2e2 100644
--- a/Inpsyde/Sniffs/CodeQuality/PropertyPerClassLimitSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/PropertyPerClassLimitSniff.php
@@ -11,53 +11,38 @@
 
 class PropertyPerClassLimitSniff implements Sniff
 {
-    /**
-     * @var mixed
-     */
-    public $maxCount = 10;
+    public int $maxCount = 10;
 
     /**
-     * @return array<int|string>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<int|string>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return array_values(Tokens::$ooScopeTokens);
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
-        is_numeric($this->maxCount) or $this->maxCount = 10;
-        $this->maxCount = (int)$this->maxCount;
-
-        $count = count(PhpcsHelpers::allPropertiesTokenPositions($file, $position));
+        $count = count(PhpcsHelpers::allPropertiesTokenPositions($phpcsFile, $stackPtr));
         if ($count <= $this->maxCount) {
             return;
         }
 
         $message = sprintf(
             '"%s" has too many properties: %d. Can be up to %d properties.',
-            PhpcsHelpers::tokenTypeName($file, $position),
+            PhpcsHelpers::tokenTypeName($phpcsFile, $stackPtr),
             $count,
             $this->maxCount
         );
 
-        $file->addWarning($message, $position, 'TooManyProperties');
+        $phpcsFile->addWarning($message, $stackPtr, 'TooManyProperties');
     }
 }
diff --git a/Inpsyde/Sniffs/CodeQuality/Psr4Sniff.php b/Inpsyde/Sniffs/CodeQuality/Psr4Sniff.php
index aaa4ac0..dc7a5b4 100644
--- a/Inpsyde/Sniffs/CodeQuality/Psr4Sniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/Psr4Sniff.php
@@ -10,48 +10,33 @@
 
 class Psr4Sniff implements Sniff
 {
-    /**
-     * @var mixed
-     */
-    public $psr4;
+    public array $psr4 = [];
+    public array $exclude = [];
 
     /**
-     * @var mixed
+     * @return list<int>
      */
-    public $exclude = [];
-
-    /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
-     */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_CLASS, T_INTERFACE, T_TRAIT];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
-        $className = (string)$file->getDeclarationName($position);
+        $className = (string)$phpcsFile->getDeclarationName($stackPtr);
 
         /** @var array<int, array<string, mixed>> $tokens */
-        $tokens = $file->getTokens();
-        $code = $tokens[$position]['code'];
+        $tokens = $phpcsFile->getTokens();
+        $code = $tokens[$stackPtr]['code'];
         $entityType = 'class';
         if ($code !== T_CLASS) {
             $entityType = $code === T_TRAIT ? 'trait' : 'interface';
@@ -59,13 +44,13 @@ public function process(File $file, $position)
 
         $this->normalizeExcluded();
 
-        if (!$this->psr4 || !is_array($this->psr4)) {
-            $this->checkFilenameOnly($file, $position, $className, $entityType);
+        if (!$this->psr4) {
+            $this->checkFilenameOnly($phpcsFile, $stackPtr, $className, $entityType);
 
             return;
         }
 
-        $this->checkPsr4($file, $position, $className, $entityType);
+        $this->checkPsr4($phpcsFile, $stackPtr, $className, $entityType);
     }
 
     /**
@@ -104,7 +89,7 @@ private function checkFilenameOnly(
      */
     private function checkPsr4(File $file, int $position, string $className, string $entityType)
     {
-        list(, $namespace) = PhpcsHelpers::findNamespace($file, $position);
+        [, $namespace] = PhpcsHelpers::findNamespace($file, $position);
         $namespace = is_string($namespace) ? "{$namespace}\\" : '';
         $namespace = rtrim($namespace, '\\');
 
@@ -155,6 +140,14 @@ private function checkPsr4(File $file, int $position, string $className, string
         );
     }
 
+    /**
+     * @param string $filePath
+     * @param string $baseNamespace
+     * @param string $namespace
+     * @param string $className
+     * @param string ...$folders
+     * @return bool
+     */
     private function checkPsr4Folders(
         string $filePath,
         string $baseNamespace,
@@ -193,14 +186,9 @@ private function checkPsr4Folders(
      * @return void
      * @psalm-assert array<string> $this->exclude
      */
-    private function normalizeExcluded()
+    private function normalizeExcluded(): void
     {
         $excluded = $this->exclude;
-        if (!$excluded || !is_array($excluded)) {
-            $this->exclude = [];
-
-            return;
-        }
 
         $this->exclude = [];
         foreach ($excluded as $className) {
diff --git a/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php b/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php
index 44561e3..33d1c6c 100644
--- a/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php
@@ -10,14 +10,14 @@
 
 class ReturnTypeDeclarationSniff implements Sniff
 {
-    const TYPE_CODES = [
+    public const TYPE_CODES = [
         T_STRING,
         T_ARRAY_HINT,
         T_CALLABLE,
         T_SELF,
     ];
 
-    const METHODS_WHITELIST = [
+    public const METHODS_WHITELIST = [
         'serialize',
         'jsonSerialize',
         'getIterator',
@@ -30,63 +30,59 @@ class ReturnTypeDeclarationSniff implements Sniff
     ];
 
     /**
-     * @return array<int|string>
-     *
-     * phpcs:disable Inpsyde.CodeQuality
+     * @return list<int|string>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality
-
         return [T_FUNCTION, T_CLOSURE];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
-     * phpcs:disable Inpsyde.CodeQuality
+     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
-        //  phpcs:enable Inpsyde.CodeQuality
+        //  phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
 
         if (
-            PhpcsHelpers::functionIsArrayAccess($file, $position)
-            || PhpcsHelpers::isUntypedPsrMethod($file, $position)
+            PhpcsHelpers::functionIsArrayAccess($phpcsFile, $stackPtr)
+            || PhpcsHelpers::isUntypedPsrMethod($phpcsFile, $stackPtr)
         ) {
             return;
         }
 
-        list($functionStart, $functionEnd) = PhpcsHelpers::functionBoundaries($file, $position);
+        [$functionStart, $functionEnd] = PhpcsHelpers::functionBoundaries($phpcsFile, $stackPtr);
 
         if (($functionStart < 0) || ($functionEnd <= 0)) {
             return;
         }
 
-        list(
+        [
             $hasNonVoidReturnType,
             $hasVoidReturnType,
             $hasNoReturnType,
             $hasNullableReturn,
             $returnsGenerator
-            ) = $this->returnTypeInfo($file, $position);
+        ] = $this->returnTypeInfo($phpcsFile, $stackPtr);
 
-        $returnData = PhpcsHelpers::returnsCountInfo($file, $position);
+        $returnData = PhpcsHelpers::returnsCountInfo($phpcsFile, $stackPtr);
         $nonVoidReturnCount = $returnData['nonEmpty'];
         $voidReturnCount = $returnData['void'];
         $nullReturnCount = $returnData['null'];
 
-        $yieldCount = $this->countYield($functionStart, $functionEnd, $file);
+        $yieldCount = $this->countYield($functionStart, $functionEnd, $phpcsFile);
 
         if ($yieldCount || $returnsGenerator) {
             $this->maybeGeneratorErrors(
                 $yieldCount,
                 $returnsGenerator,
                 $nonVoidReturnCount,
-                $file,
-                $position
+                $phpcsFile,
+                $stackPtr
             );
 
             return;
@@ -100,8 +96,8 @@ public function process(File $file, $position)
             $nonVoidReturnCount,
             $nullReturnCount,
             $voidReturnCount,
-            $file,
-            $position
+            $phpcsFile,
+            $stackPtr
         );
     }
 
@@ -129,7 +125,7 @@ private function maybeErrors(
         int $voidReturnCount,
         File $file,
         int $position
-    ) {
+    ): void {
 
         $hasNullableReturn
             ? $nonVoidReturnCount += $nullReturnCount
@@ -197,7 +193,7 @@ private function maybeGeneratorErrors(
         int $nonVoidReturnCount,
         File $file,
         int $position
-    ) {
+    ): void {
 
         if ($nonVoidReturnCount > 1) {
             $file->addWarning(
@@ -287,7 +283,7 @@ private function returnTypeInfo(File $file, int $functionPosition): array
             return [false, false, true, false, false];
         }
 
-        $start = (int)((int)($tokens[$functionPosition]['parenthesis_closer']) + 1);
+        $start = (int)($tokens[$functionPosition]['parenthesis_closer']) + 1;
         $end = (int)($tokens[$functionPosition]['scope_opener']);
         $hasNullable = false;
         for ($i = $start; $i < $end; $i++) {
@@ -295,9 +291,6 @@ private function returnTypeInfo(File $file, int $functionPosition): array
                 $hasNullable = true;
                 break;
             }
-            if ($tokens[$i]['code'] === T_WHITESPACE) {
-                continue;
-            }
         }
 
         $hasNonVoidReturnType = $returnTypeContent !== 'void';
@@ -361,8 +354,7 @@ private function countYield(int $functionStart, int $functionEnd, File $file): i
         $tokens = $file->getTokens();
         for ($i = ($functionStart + 1); $i < $functionEnd; $i++) {
             if ($tokens[$i]['code'] === T_CLOSURE) {
-                /** @psalm-suppress LoopInvalidation */
-                $i = (int)($tokens[$i]['scope_closer']);
+                $i = (int)($tokens[$i]['scope_closer'] ?? -1);
                 continue;
             }
             if ($tokens[$i]['code'] === T_YIELD || $tokens[$i]['code'] === T_YIELD_FROM) {
diff --git a/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php b/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php
index 1945d6c..fe31154 100644
--- a/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php
@@ -11,38 +11,30 @@
 class StaticClosureSniff implements Sniff
 {
     /**
-     * @return array<string>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
+     * @return list<string>
      */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_CLOSURE];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
-        list($functionStart, $functionEnd) = PhpcsHelpers::functionBoundaries($file, $position);
+        [$functionStart, $functionEnd] = PhpcsHelpers::functionBoundaries($phpcsFile, $stackPtr);
         if ($functionStart < 0 || $functionEnd <= 0) {
             return;
         }
 
-        $isStatic = $file->findPrevious(T_STATIC, $position, $position - 3, false, null, true);
+        $isStatic = $phpcsFile->findPrevious(T_STATIC, $stackPtr, $stackPtr - 3, false, null, true);
         if ($isStatic) {
             return;
         }
@@ -51,7 +43,7 @@ public function process(File $file, $position)
         $i = $functionStart + 1;
 
         /** @var array<int, array<string, mixed>> $tokens */
-        $tokens = $file->getTokens();
+        $tokens = $phpcsFile->getTokens();
         while (!$thisFound && ($i < $functionEnd)) {
             $token = $tokens[$i];
             $thisFound = ($token['code'] === T_VARIABLE) && ($token['content'] === '$this');
@@ -62,23 +54,23 @@ public function process(File $file, $position)
             return;
         }
 
-        $boundDoc = PhpcsHelpers::functionDocBlockTag('@bound', $file, $position);
+        $boundDoc = PhpcsHelpers::functionDocBlockTag('@bound', $phpcsFile, $stackPtr);
         if ($boundDoc) {
             return;
         }
 
-        $varDoc = PhpcsHelpers::functionDocBlockTag('@var', $file, $position);
+        $varDoc = PhpcsHelpers::functionDocBlockTag('@var', $phpcsFile, $stackPtr);
         foreach ($varDoc as $content) {
             if (preg_match('~(?:^|\s+)\$this(?:$|\s+)~', $content)) {
                 return;
             }
         }
 
-        $line = (int)$tokens[$position]['line'];
+        $line = (int)$tokens[$stackPtr]['line'];
         $message = sprintf('Closure found at line %d could be static.', $line);
 
-        if ($file->addFixableWarning($message, $position, 'PossiblyStaticClosure')) {
-            $this->fix($position, $file);
+        if ($phpcsFile->addFixableWarning($message, $stackPtr, 'PossiblyStaticClosure')) {
+            $this->fix($stackPtr, $phpcsFile);
         }
     }
 
diff --git a/Inpsyde/Sniffs/CodeQuality/VariablesNameSniff.php b/Inpsyde/Sniffs/CodeQuality/VariablesNameSniff.php
index acfdec1..dbe8502 100644
--- a/Inpsyde/Sniffs/CodeQuality/VariablesNameSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/VariablesNameSniff.php
@@ -10,7 +10,7 @@
 
 class VariablesNameSniff implements Sniff
 {
-    const GLOBALS = [
+    public const GLOBALS = [
         '$_GET',
         '$_POST',
         '$_REQUEST',
@@ -22,7 +22,7 @@ class VariablesNameSniff implements Sniff
         '$GLOBALS',
     ];
 
-    const WP_GLOBALS = [
+    public const WP_GLOBALS = [
         '$current_user',
         '$is_iphone',
         '$is_chrome',
@@ -46,58 +46,35 @@ class VariablesNameSniff implements Sniff
         '$interim_login',
     ];
 
-    /**
-     * @var mixed
-     */
-    public $checkType = 'camelCase';
-
-    /**
-     * @var mixed
-     */
-    public $ignoredNames = [];
+    public string $checkType = 'camelCase';
+    public array $ignoredNames = [];
+    public bool $ignoreLocalVars = false;
+    public bool $ignoreProperties = false;
 
     /**
-     * @var mixed
+     * @return list<int>
      */
-    public $ignoreLocalVars = false;
-
-    /**
-     * @var mixed
-     */
-    public $ignoreProperties = false;
-
-    /**
-     * @return array<int>
-     *
-     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
-     */
-    public function register()
+    public function register(): array
     {
-        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
-
         return [T_VARIABLE];
     }
 
     /**
-     * @param File $file
-     * @param int $position
+     * @param File $phpcsFile
+     * @param int $stackPtr
      * @return void
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      */
-    public function process(File $file, $position)
+    public function process(File $phpcsFile, $stackPtr): void
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
         $ignored = $this->allIgnored();
 
         /** @var array<int, array<string, mixed>> $tokens */
-        $tokens = $file->getTokens();
-        $name = (string)$tokens[$position]['content'];
+        $tokens = $phpcsFile->getTokens();
+        $name = (string)$tokens[$stackPtr]['content'];
 
         if (
             in_array($name, $ignored, true)
@@ -114,7 +91,7 @@ public function process(File $file, $position)
             return;
         }
 
-        $isProperty = PhpcsHelpers::variableIsProperty($file, $position);
+        $isProperty = PhpcsHelpers::variableIsProperty($phpcsFile, $stackPtr);
 
         if (
             ($isProperty && $this->arePropertiesIgnored())
@@ -123,12 +100,12 @@ public function process(File $file, $position)
             return;
         }
 
-        $file->addWarning(
+        $phpcsFile->addWarning(
             sprintf(
                 '"%s" should be used for variable names.',
                 $isCamelCase ? '$camelCase' : '$snake_case'
             ),
-            $position,
+            $stackPtr,
             $isCamelCase ? 'SnakeCaseVar' : 'CamelCaseVar'
         );
     }
@@ -138,10 +115,6 @@ public function process(File $file, $position)
      */
     private function checkType(): string
     {
-        if (!is_string($this->checkType)) {
-            return 'camelCase';
-        }
-
         $type = strtolower(trim($this->checkType));
         if (in_array($type, ['camelcase', 'snake_case'], true)) {
             return $type === 'camelcase' ? 'camelCase' : 'snake_case';
@@ -192,17 +165,9 @@ private function checkSnakeCase(string $name): bool
      */
     private function allIgnored(): array
     {
-        if (is_string($this->ignoredNames)) {
-            $this->ignoredNames = explode(',', $this->ignoredNames);
-        }
-
-        if (!is_array($this->ignoredNames)) {
-            $this->ignoredNames = [];
-        }
-
         $ignored = $this->ignoredNames;
 
-        /** @var array<string> $normalized */
+        /** @var list<string> $normalized */
         $normalized = [];
         foreach ($ignored as $name) {
             if (is_string($name)) {
diff --git a/Inpsyde/ruleset.xml b/Inpsyde/ruleset.xml
index afd920b..c70db7a 100644
--- a/Inpsyde/ruleset.xml
+++ b/Inpsyde/ruleset.xml
@@ -11,7 +11,6 @@
     -->
     <rule ref="PSR12">
         <exclude name="Generic.Files.LineLength.TooLong"/>
-        <exclude name="PSR12.Properties.ConstantVisibility"/>
     </rule>
 
     <!--
diff --git a/phpcs.xml b/phpcs.xml
index dec7c58..f8ebb51 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -4,16 +4,16 @@
     <description>PHP 7+ coding standards for Inpsyde WordPress projects.</description>
 
     <autoload>./Inpsyde/PhpcsHelpers.php</autoload>
-    
+
     <file>./Inpsyde/Sniffs</file>
     <file>./Inpsyde/PhpcsHelpers.php</file>
     <file>./tests/src</file>
     <file>./tests/cases</file>
 
     <!--
-    PHP 7.0 and higher.
+    PHP 7.4 and higher.
     -->
-    <config name="testVersion" value="7.0-"/>
+    <config name="testVersion" value="7.4-"/>
 
     <!--
     Arguments: colors, show progress and show sniff name.
@@ -27,33 +27,6 @@
     -->
     <rule ref="PSR12">
         <exclude name="Generic.Files.LineLength.TooLong"/>
-        <exclude name="PSR12.Properties.ConstantVisibility"/>
-    </rule>
-
-    <!--
-    Neutron standard are quality tools for PHP7 development from Automattic.
-    See https://github.com/Automattic/phpcs-neutron-standard
-    -->
-    <rule ref="NeutronStandard.AssignAlign.DisallowAssignAlign">
-        <type>warning</type>
-    </rule>
-    <rule ref="NeutronStandard.Functions.DisallowCallUserFunc">
-        <type>warning</type>
-    </rule>
-    <rule ref="NeutronStandard.Globals.DisallowGlobalFunctions">
-        <type>warning</type>
-    </rule>
-    <rule ref="NeutronStandard.MagicMethods.DisallowMagicSerialize">
-        <type>warning</type>
-    </rule>
-    <rule ref="NeutronStandard.StrictTypes.RequireStrictTypes">
-        <type>warning</type>
-    </rule>
-    <rule ref="NeutronStandard.Whitespace.DisallowMultipleNewlines">
-        <type>warning</type>
-    </rule>
-    <rule ref="NeutronStandard.Whitespace.RequireNewlineBetweenFunctions">
-        <type>warning</type>
     </rule>
 
     <!--
@@ -66,30 +39,6 @@
     <rule ref="WordPress.DB.PreparedSQL"/>
     <rule ref="WordPress.DB.RestrictedClasses"/>
     <rule ref="WordPress.DB.RestrictedFunctions"/>
-    <rule ref="WordPress.DateTime.CurrentTimeTimestamp"/>
-    <rule ref="WordPress.NamingConventions.PrefixAllGlobals"/>
-    <rule ref="WordPress.NamingConventions.ValidHookName">
-        <properties>
-            <property name="additionalWordDelimiters" value="-/."/>
-        </properties>
-    </rule>
-    <rule ref="WordPress.NamingConventions.ValidPostTypeSlug"/>
-    <rule ref="WordPress.PHP.DevelopmentFunctions"/>
-    <rule ref="WordPress.PHP.DevelopmentFunctions.error_log">
-        <type>error</type>
-    </rule>
-    <rule ref="WordPress.PHP.DevelopmentFunctions.prevent_path_disclosure">
-        <type>error</type>
-    </rule>
-    <rule ref="WordPress.PHP.RestrictedPHPFunctions"/>
-    <rule ref="WordPress.PHP.DiscouragedPHPFunctions">
-        <properties>
-            <property name="exclude" type="array" value="serialize,urlencode,obfuscation"/>
-        </properties>
-    </rule>
-    <rule ref="WordPress.PHP.DiscouragedPHPFunctions.runtime_configuration">
-        <type>error</type>
-    </rule>
     <rule ref="WordPress.PHP.DontExtract"/>
     <rule ref="WordPress.PHP.IniSet"/>
     <rule ref="WordPress.PHP.NoSilencedErrors"/>
@@ -98,17 +47,7 @@
     <rule ref="WordPress.PHP.RestrictedPHPFunctions"/>
     <rule ref="WordPress.PHP.StrictInArray"/>
     <rule ref="WordPress.PHP.TypeCasts"/>
-    <rule ref="WordPress.Security.EscapeOutput"/>
-    <rule ref="WordPress.Security.NonceVerification"/>
-    <rule ref="WordPress.Security.PluginMenuSlug"/>
     <rule ref="WordPress.Security.SafeRedirect"/>
-    <rule ref="WordPress.Security.ValidatedSanitizedInput"/>
-    <rule ref="WordPress.WP.AlternativeFunctions.curl"/>
-    <rule ref="WordPress.WP.AlternativeFunctions.file_get_contents"/>
-    <rule ref="WordPress.WP.AlternativeFunctions.file_system_read"/>
-    <rule ref="WordPress.WP.AlternativeFunctions.strip_tags"/>
-    <rule ref="WordPress.WP.AlternativeFunctions.rand_seeding"/>
-    <rule ref="WordPress.WP.AlternativeFunctions.rand"/>
     <rule ref="WordPress.WP.CapitalPDangit"/>
     <rule ref="WordPress.WP.DeprecatedClasses"/>
     <rule ref="WordPress.WP.DeprecatedFunctions"/>
@@ -116,9 +55,6 @@
     <rule ref="WordPress.WP.DeprecatedParameterValues"/>
     <rule ref="WordPress.WP.DiscouragedConstants"/>
     <rule ref="WordPress.WP.DiscouragedFunctions"/>
-    <rule ref="WordPress.WP.EnqueuedResourceParameters"/>
-    <rule ref="WordPress.WP.EnqueuedResources"/>
-    <rule ref="WordPress.WP.I18n"/>
 
     <!--
     Curated list of WordPress VIP rules.
@@ -133,9 +69,7 @@
     <rule ref="WordPressVIPMinimum.Functions.StripTags"/>
     <rule ref="WordPressVIPMinimum.Hooks.AlwaysReturnInFilter"/>
     <rule ref="WordPressVIPMinimum.Hooks.PreGetPosts"/>
-    <rule ref="WordPressVIPMinimum.Performance.CacheValueOverride"/>
     <rule ref="WordPressVIPMinimum.Performance.RegexpCompare"/>
-    <rule ref="WordPressVIPMinimum.Performance.TaxonomyMetaInOptions"/>
     <rule ref="WordPressVIPMinimum.Security.EscapingVoidReturnFunctions"/>
     <rule ref="WordPressVIPMinimum.Security.ExitAfterRedirect"/>
     <rule ref="WordPressVIPMinimum.Security.PHPFilterFunctions"/>
@@ -185,7 +119,6 @@
     Use own rules :)
     -->
     <rule ref="./Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php"/>
-    <rule ref="./Inpsyde/Sniffs/CodeQuality/ConstantVisibilitySniff.php"/>
     <rule ref="./Inpsyde/Sniffs/CodeQuality/DisallowShortOpenTagSniff.php"/>
     <rule ref="./Inpsyde/Sniffs/CodeQuality/ElementNameMinimalLengthSniff.php"/>
     <rule ref="./Inpsyde/Sniffs/CodeQuality/ForbiddenPublicPropertySniff.php"/>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 76b6d6e..d997102 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
-	backupGlobals="false"
-	backupStaticAttributes="false"
-	bootstrap="tests/bootstrap.php"
-	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
-	processIsolation="false"
-	stopOnFailure="false">
-	<testsuites>
-		<testsuite name="fixtures">
-			<file>tests/cases/FixturesTest.php</file>
-		</testsuite>
-		<testsuite name="helpers">
-			<file>tests/cases/PhpcsHelpersTest.php</file>
-		</testsuite>
-	</testsuites>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    bootstrap="tests/bootstrap.php"
+    colors="true">
+    <coverage>
+       <include>
+           <directory>./Inpsyde</directory>
+       </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="fixtures">
+            <file>tests/cases/FixturesTest.php</file>
+        </testsuite>
+        <testsuite name="helpers">
+            <file>tests/cases/PhpcsHelpersTest.php</file>
+        </testsuite>
+    </testsuites>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
index ee09b08..53e46c1 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0"?>
 <psalm
+    errorLevel="1"
     autoloader="./.psalm/autoloader.php"
     useDocblockPropertyTypes="true"
     usePhpDocMethodsWithoutMagicCall="true"
     strictBinaryOperands="true"
     ignoreInternalFunctionFalseReturn="false"
     ignoreInternalFunctionNullReturn="false"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     hideExternalErrors="true"
     allowNamedArgumentCalls="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,8 +24,5 @@
 
     <issueHandlers>
         <MixedAssignment errorLevel="suppress" />
-        <MixedArrayTypeCoercion errorLevel="suppress" />
-        <InvalidCast errorLevel="suppress" />
-        <ParamNameMismatch errorLevel="suppress" />
     </issueHandlers>
 </psalm>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 878abe6..6fd220d 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,6 @@
-<?php # -*- coding: utf-8 -*-
-/*
+<?php
+
+/**
  * This file is part of the Wonolog package.
  *
  * (c) Inpsyde GmbH
@@ -8,16 +9,30 @@
  * file that was distributed with this source code.
  */
 
-putenv('SNIFFS_PATH=' . realpath(dirname(__DIR__) . '/Inpsyde/Sniffs'));
-putenv('SNIFFS_NAMESPACE=' . 'Inpsyde\\Sniffs');
-putenv('FIXTURES_PATH=' . realpath(__DIR__ . '/fixtures'));
+declare(strict_types=1);
+
+$testsDir = str_replace('\\', '/', __DIR__);
+$libDir = dirname($testsDir);
+$vendorDir = "{$libDir}/vendor";
+$autoload = "{$vendorDir}/autoload.php";
 
-$vendor = dirname(__DIR__) . '/vendor/';
-if (!realpath($vendor)) {
+if (!is_file($autoload)) {
     die('Please install via Composer before running tests.');
 }
 
-require_once($vendor . 'autoload.php');
-require_once($vendor . 'squizlabs/php_codesniffer/tests/bootstrap.php');
-require_once(dirname(__DIR__) . '/Inpsyde/PhpcsHelpers.php');
-unset($vendor);
+putenv("SNIFFS_PATH={$libDir}/Inpsyde/Sniffs");
+putenv('SNIFFS_NAMESPACE=Inpsyde\\Sniffs');
+putenv("FIXTURES_PATH={$testsDir}/fixtures");
+
+if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
+    define('PHPUNIT_COMPOSER_INSTALL', $autoload);
+    require_once $autoload;
+}
+
+require_once "{$vendorDir}/squizlabs/php_codesniffer/autoload.php";
+require_once "{$vendorDir}/squizlabs/php_codesniffer/tests/bootstrap.php";
+require_once "{$libDir}/Inpsyde/PhpcsHelpers.php";
+
+unset($libDir, $testsDir, $vendorDir, $autoload);
+
+error_reporting(E_ALL);
diff --git a/tests/cases/FixturesTest.php b/tests/cases/FixturesTest.php
index c59eef3..875050a 100644
--- a/tests/cases/FixturesTest.php
+++ b/tests/cases/FixturesTest.php
@@ -1,9 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-# -*- coding: utf-8 -*-
-/*
+/**
  * This file is part of the php-coding-standards package.
  *
  * (c) Inpsyde GmbH
@@ -12,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Inpsyde\CodingStandard\Tests;
 
 use PHP_CodeSniffer\Files\LocalFile;
@@ -22,12 +21,11 @@
 use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @package php-coding-standards
- * @license http://opensource.org/licenses/MIT MIT
- */
 class FixturesTest extends TestCase
 {
+    /**
+     * @return \Traversable
+     */
     public function fixtureProvider(): \Traversable
     {
         foreach ((glob(getenv('FIXTURES_PATH') . '/*.php') ?: []) as $fixtureFile) {
@@ -39,7 +37,7 @@ public function fixtureProvider(): \Traversable
     /**
      * @dataProvider fixtureProvider
      */
-    public function testAllFixtures(string $fixtureFile)
+    public function testAllFixtures(string $fixtureFile): void
     {
         $parser = new FixtureContentParser();
         $failures = new \SplStack();
@@ -71,7 +69,7 @@ private function validateFixture(
         string $fixtureFile,
         FixtureContentParser $parser,
         \SplStack $failures
-    ) {
+    ): void {
 
         $fixtureBasename = basename($fixtureFile);
 
@@ -81,7 +79,7 @@ private function validateFixture(
              * @var SniffMessages $expected
              * @var array $properties
              */
-            list($sniffClass, $expected, $properties) = $parser->parse($fixtureFile);
+            [$sniffClass, $expected, $properties] = $parser->parse($fixtureFile);
 
             $file = $this->createPhpcsForFixture($sniffClass, $fixtureFile, $properties);
             $actual = (new SniffMessagesExtractor($file))->extractMessages();
@@ -105,7 +103,7 @@ private function validateCodes(
         SniffMessages $actual,
         string $fixture,
         string $sniffClass
-    ) {
+    ): void {
 
         $where = sprintf("\nin fixture file '%s' line %%d\nfor sniff '%s'", $fixture, $sniffClass);
 
@@ -136,7 +134,7 @@ private function validateCode(
         string $code,
         string $where,
         string $actualCode = null
-    ) {
+    ): void {
 
         $message = $code
             ? sprintf('Expected %s code \'%s\' was not found', $type, $code)
@@ -158,7 +156,7 @@ private function validateTotals(
         SniffMessages $actual,
         string $fixtureFile,
         string $sniffClass
-    ) {
+    ): void {
 
         $expectedTotal = $expected->total();
         $actualTotal = $actual->total();
@@ -195,22 +193,20 @@ private function createPhpcsForFixture(
         array $properties
     ): File {
 
-        $sniffName = str_replace('.', DIRECTORY_SEPARATOR, $sniffName) . 'Sniff';
-        $sniffFile = getenv('SNIFFS_PATH') . DIRECTORY_SEPARATOR . "{$sniffName}.php";
-        if (!file_exists($sniffFile) || !is_readable($sniffFile)) {
+        $sniffFile = str_replace('.', '/', "{$sniffName}Sniff");
+        $sniffPath = getenv('SNIFFS_PATH') . "/{$sniffFile}.php";
+        if (!file_exists($sniffPath) || !is_readable($sniffPath)) {
             // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-            throw new Exception("Non-existent of unreadable sniff file '$sniffFile' found.");
+            throw new Exception("Non-existent of unreadable sniff file '{$sniffPath}' found.");
         }
 
         $config = new Config();
-        $config->standards = [];
-        /** @var Ruleset $ruleset */
-        $ruleset = (new \ReflectionClass(Ruleset::class))->newInstanceWithoutConstructor();
-        $ruleset->registerSniffs([$sniffFile], [], []);
-        $ruleset->populateTokenListeners();
+        $config->standards = [dirname(getenv('SNIFFS_PATH'))];
+        $config->sniffs = ["Inpsyde.{$sniffName}"];
+        $ruleset = new Ruleset($config);
 
         $baseSniffNamespace = getenv('SNIFFS_NAMESPACE');
-        $sniffFqn = str_replace(DIRECTORY_SEPARATOR, '\\', $sniffName);
+        $sniffFqn = str_replace('/', '\\', $sniffFile);
         foreach ($properties as $name => $value) {
             $ruleset->setSniffProperty("{$baseSniffNamespace}\\{$sniffFqn}", $name, $value);
         }
diff --git a/tests/cases/PhpcsHelpersTest.php b/tests/cases/PhpcsHelpersTest.php
index d94b1e3..bbdc19e 100644
--- a/tests/cases/PhpcsHelpersTest.php
+++ b/tests/cases/PhpcsHelpersTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of the php-coding-standards package.
+ *
+ * (c) Inpsyde GmbH
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Inpsyde\CodingStandard\Tests;
@@ -11,12 +20,13 @@
 use PHPUnit\Framework\TestCase;
 use PHP_CodeSniffer\Files\File;
 
+// phpcs:disable Inpsyde.CodeQuality.FunctionLength
 class PhpcsHelpersTest extends TestCase
 {
     /**
      * @test
      */
-    public function testClassProperties()
+    public function testClassProperties(): void
     {
         $php = <<<'PHP'
 <?php
@@ -70,7 +80,7 @@ function foo($foo, int $bar) {
     /**
      * @test
      */
-    public function testClassMethods()
+    public function testClassMethods(): void
     {
         $php = <<<'PHP'
 <?php
@@ -121,7 +131,7 @@ function testTest() {
     /**
      * @test
      */
-    public function testFunctionCall()
+    public function testFunctionCall(): void
     {
         $php = <<<'PHP'
 <?php
@@ -171,7 +181,7 @@ function y(): callable {
     /**
      * @test
      */
-    public function testTokenName()
+    public function testTokenName(): void
     {
         $php = <<<'PHP'
 <?php
@@ -214,7 +224,7 @@ function l() {
     /**
      * @test
      */
-    public function testHookClosure()
+    public function testHookClosure(): void
     {
         $php = <<<'PHP'
 <?php
@@ -256,14 +266,9 @@ function add_action($x, $y) {
 
     /**
      * @test
-     *
-     * phpcs:disable Inpsyde.CodeQuality.FunctionLength
      */
-    public function testReturnCount()
+    public function testReturnCount(): void
     {
-        // phpcs:enable Inpsyde.CodeQuality.FunctionLength
-
-        /** @noinspection PhpInconsistentReturnPointsInspection */
         $php = <<<'PHP'
 <?php
 class Test {
@@ -328,13 +333,9 @@ public function something($x) {
 
     /**
      * @test
-     *
-     * phpcs:disable Inpsyde.CodeQuality.FunctionLength
      */
     public function testDocBlocTag()
     {
-        // phpcs:enable Inpsyde.CodeQuality.FunctionLength
-
         $php = <<<'PHP'
 <?php
 class Test {
@@ -453,7 +454,7 @@ function something(string $foo, bool $bool): string {
     /**
      * @test
      */
-    public function testParamTypes()
+    public function testParamTypes(): void
     {
         $php = <<<'PHP'
 <?php
@@ -503,7 +504,7 @@ function something(string $foo, $bar): string {
     /**
      * @test
      */
-    public function testIsUntypedPsrMethodWithClass()
+    public function testIsUntypedPsrMethodWithClass(): void
     {
         $php = <<<'PHP'
 <?php
@@ -540,7 +541,7 @@ public function has($id)
     /**
      * @test
      */
-    public function testIsUntypedPsrMethodWithAnonClass()
+    public function testIsUntypedPsrMethodWithAnonClass(): void
     {
         $php = <<<'PHP'
 <?php
diff --git a/tests/src/FixtureContentParser.php b/tests/src/FixtureContentParser.php
index 6b934a1..54b1dee 100644
--- a/tests/src/FixtureContentParser.php
+++ b/tests/src/FixtureContentParser.php
@@ -1,9 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-# -*- coding: utf-8 -*-
-/*
+/**
  * This file is part of the php-coding-standards package.
  *
  * (c) Inpsyde GmbH
@@ -12,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Inpsyde\CodingStandard\Tests;
+declare(strict_types=1);
 
-use PHPUnit\Framework\Exception;
+namespace Inpsyde\CodingStandard\Tests;
 
 /**
  * @package php-coding-standards
@@ -22,11 +19,11 @@
  */
 class FixtureContentParser
 {
-    const TOKEN_SNIFF = '@phpcsSniff';
-    const TOKEN_PROCESS_START = '@phpcsProcessFixtureStart';
-    const TOKEN_PROCESS_END = '@phpcsProcessFixtureEnd';
-    const TOKEN_PROPERTIES_START = '@phpcsSniffPropertiesStart';
-    const TOKEN_PROPERTIES_END = '@phpcsSniffPropertiesEnd';
+    public const TOKEN_SNIFF = '@phpcsSniff';
+    public const TOKEN_PROCESS_START = '@phpcsProcessFixtureStart';
+    public const TOKEN_PROCESS_END = '@phpcsProcessFixtureEnd';
+    public const TOKEN_PROPERTIES_START = '@phpcsSniffPropertiesStart';
+    public const TOKEN_PROPERTIES_END = '@phpcsSniffPropertiesEnd';
 
     /**
      * @param string $fixturePath
@@ -35,8 +32,7 @@ class FixtureContentParser
     public function parse(string $fixturePath): array
     {
         if (!file_exists($fixturePath) || !is_readable($fixturePath)) {
-            // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-            throw new Exception("Fixture file {$fixturePath} is not readable.");
+            throw new \Error("Fixture file {$fixturePath} is not readable.");
         }
 
         $accumulator = (object)[
@@ -56,70 +52,69 @@ public function parse(string $fixturePath): array
             ],
         ];
 
-        // phpcs:disable VariableAnalysis
         foreach ($this->readFile($fixturePath) as $lineNum => $line) {
             $this->readLine($lineNum, $line, $accumulator);
         }
-        // phpcs:enable
 
         return $this->processResults($accumulator, $fixturePath);
     }
 
     /**
-     * @param \stdClass $accumulator
+     * @param object $accumulator
      * @param string $fixturePath
      * @return array
      */
-    private function processResults(\stdClass $accumulator, string $fixturePath): array
+    private function processResults(object $accumulator, string $fixturePath): array
     {
-        $results = [
-            $accumulator->sniff,
-            $accumulator->messages,
-            $accumulator->warnings,
-            $accumulator->errors,
-            $accumulator->properties->values,
-        ];
-
         if (!$accumulator->process->content) {
             return [
-                $this->checkSniffName(array_shift($results)),
-                new SniffMessages($results[1], $results[2], $results[0]),
+                $this->checkSniffName($accumulator->sniff),
+                new SniffMessages(
+                    $accumulator->warnings,
+                    $accumulator->errors,
+                    $accumulator->messages
+                ),
                 $accumulator->properties->values,
             ];
         }
 
         // phpcs:disable
         eval("\$cb = {$accumulator->process->content};");
-        /** @var callable $cb */
-        $results = $cb(...$results);
+        $params = [
+            $accumulator->sniff,
+            $accumulator->messages,
+            $accumulator->warnings,
+            $accumulator->errors,
+            $accumulator->properties->values,
+        ];
+        /** @var mixed $cb */
+        $results = is_callable($cb) ? $cb(...$params) : null;
         // phpcs:enable
 
+        $results = array_values(array_pad(is_array($results) ? $results : [], 5, null));
+        [$sniff, $messages, $warnings, $errors, $properties] = $results;
+
         if (
-            $accumulator->process->content
-            && !is_array($results)
-            || count($results) !== 5
-            || !is_string($results[0] ?? null)
-            || !is_array($results[1] ?? null)
-            || !is_array($results[2] ?? null)
-            || !is_array($results[3] ?? null)
-            || !is_array($results[4] ?? null)
+            !is_string($sniff)
+            || !is_array($messages)
+            || !is_array($warnings)
+            || !is_array($errors)
+            || !is_array($properties)
         ) {
-            throw new Exception(
-                // phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped
+            throw new \Error(
                 sprintf(
                     "Process callback for fixture '%s' (lines #%s:#%s) returned invalid output.",
                     $fixturePath,
                     $accumulator->process->start,
                     $accumulator->process->end
                 )
-                // phpcs:enable WordPress.Security.EscapeOutput.OutputNotEscaped
             );
         }
 
         return [
-            $this->checkSniffName(array_shift($results)),
-            new SniffMessages($results[1], $results[2], $results[0]),
-            $results[3],
+            $this->checkSniffName($sniff),
+            new SniffMessages($warnings, $errors, $messages),
+            $properties,
         ];
     }
 
@@ -127,10 +122,10 @@ private function processResults(\stdClass $accumulator, string $fixturePath): ar
      * @param string|null $sniff
      * @return string
      */
-    private function checkSniffName(string $sniff = null): string
+    private function checkSniffName(?string $sniff): string
     {
         if ($sniff === null) {
-            throw new Exception("No sniff class found for the test.");
+            throw new \Error("No sniff class found for the test.");
         }
 
         static $regex;
@@ -140,8 +135,7 @@ private function checkSniffName(string $sniff = null): string
         }
 
         if (!preg_match('~^' . $regex . '$~', $sniff)) {
-            // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-            throw new Exception("Invalid sniff name '{$sniff}'.");
+            throw new \Error("Invalid sniff name '{$sniff}'.");
         }
 
         return $sniff;
@@ -154,6 +148,10 @@ private function checkSniffName(string $sniff = null): string
     private function readFile(string $file): \Generator
     {
         $handle = fopen($file, 'rb');
+        if ($handle === false) {
+            throw new \Error("Could not open '{$file}' for reading.");
+        }
+
         $lineNum = 1;
 
         $line = fgets($handle);
@@ -168,9 +166,9 @@ private function readFile(string $file): \Generator
     /**
      * @param int $lineNum
      * @param string $line
-     * @param \stdClass $accumulator
+     * @param object $accumulator
      */
-    private function readLine(int $lineNum, string $line, \stdClass $accumulator)
+    private function readLine(int $lineNum, string $line, object $accumulator): void
     {
         if (
             !$this->readProcessLine($lineNum, $line, $accumulator)
@@ -184,10 +182,10 @@ private function readLine(int $lineNum, string $line, \stdClass $accumulator)
     /**
      * @param int $lineNum
      * @param string $line
-     * @param \stdClass $accumulator
+     * @param object $accumulator
      * @return bool
      */
-    private function readProcessLine(int $lineNum, string $line, \stdClass $accumulator): bool
+    private function readProcessLine(int $lineNum, string $line, object $accumulator): bool
     {
         if ($accumulator->process->end !== false) {
             return false;
@@ -213,10 +211,10 @@ private function readProcessLine(int $lineNum, string $line, \stdClass $accumula
 
     /**
      * @param string $line
-     * @param \stdClass $accumulator
+     * @param object $accumulator
      * @return bool
      */
-    private function readSniffLine(string $line, \stdClass $accumulator): bool
+    private function readSniffLine(string $line, object $accumulator): bool
     {
         if ($accumulator->sniff) {
             return false;
@@ -238,10 +236,10 @@ private function readSniffLine(string $line, \stdClass $accumulator): bool
     /**
      * @param int $lineNum
      * @param string $line
-     * @param \stdClass $accumulator
+     * @param object $accumulator
      * @return bool
      */
-    private function readPropertiesLine(int $lineNum, string $line, \stdClass $accumulator): bool
+    private function readPropertiesLine(int $lineNum, string $line, object $accumulator): bool
     {
         static $pattern;
         $pattern or $pattern = '~\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\s*=\s*([^;]+);~';
@@ -274,9 +272,9 @@ private function readPropertiesLine(int $lineNum, string $line, \stdClass $accum
     /**
      * @param int $lineNum
      * @param string $line
-     * @param \stdClass $accumulator
+     * @param object $accumulator
      */
-    private function readTokenLine(int $lineNum, string $line, \stdClass $accumulator)
+    private function readTokenLine(int $lineNum, string $line, object $accumulator): void
     {
         static $pattern;
         if (!$pattern) {
diff --git a/tests/src/SniffMessages.php b/tests/src/SniffMessages.php
index c5aa846..339b8f5 100644
--- a/tests/src/SniffMessages.php
+++ b/tests/src/SniffMessages.php
@@ -1,9 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-# -*- coding: utf-8 -*-
-/*
+/**
  * This file is part of the php-coding-standards package.
  *
  * (c) Inpsyde GmbH
@@ -12,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Inpsyde\CodingStandard\Tests;
 
 /**
@@ -20,34 +19,19 @@
  */
 final class SniffMessages
 {
-    /**
-     * @var array
-     */
-    private $warnings;
-
-    /**
-     * @var array
-     */
-    private $errors;
-
-    /**
-     * @var array
-     */
-    private $messages;
-
-    /**
-     * @var bool
-     */
-    private $messagesContainTotal = false;
+    private array $warnings;
+    private array $errors;
+    private array $messages;
+    private bool $messagesContainTotal = false;
 
     /**
      * @param array $warnings
      * @param array $errors
      * @param array|null $messages
      */
-    public function __construct(array $warnings, array $errors, array $messages = null)
+    public function __construct(array $warnings, array $errors, ?array $messages = null)
     {
-        if (is_null($messages)) {
+        if ($messages === null) {
             $messages = $errors + $warnings;
             $this->messagesContainTotal = true;
         }
@@ -69,7 +53,7 @@ public function messages(): array
      * @param int $line
      * @return string|null
      */
-    public function messageIn(int $line)
+    public function messageIn(int $line): ?string
     {
         return $this->messages[$line] ?? null;
     }
@@ -99,7 +83,7 @@ public function errors(): array
      * @param int $line
      * @return string|null
      */
-    public function errorIn(int $line)
+    public function errorIn(int $line): ?string
     {
         return $this->errors[$line] ?? null;
     }
@@ -124,7 +108,7 @@ public function warnings(): array
      * @param int $line
      * @return string|null
      */
-    public function warningIn(int $line)
+    public function warningIn(int $line): ?string
     {
         return $this->warnings[$line] ?? null;
     }
diff --git a/tests/src/SniffMessagesExtractor.php b/tests/src/SniffMessagesExtractor.php
index 6f8f8b7..1f98b27 100644
--- a/tests/src/SniffMessagesExtractor.php
+++ b/tests/src/SniffMessagesExtractor.php
@@ -1,9 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-# -*- coding: utf-8 -*-
-/*
+/**
  * This file is part of the php-coding-standards package.
  *
  * (c) Inpsyde GmbH
@@ -12,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Inpsyde\CodingStandard\Tests;
 
 use PHP_CodeSniffer\Files\File;
@@ -22,10 +21,7 @@
  */
 class SniffMessagesExtractor
 {
-    /**
-     * @var File
-     */
-    private $file;
+    private File $file;
 
     /**
      * @param File $file
@@ -41,7 +37,7 @@ public function __construct(File $file)
     public function extractMessages(): SniffMessages
     {
         $this->file->process();
-        list($warnings, $errors) = $this->normalize(
+        [$warnings, $errors] = $this->normalize(
             $this->file->getWarnings(),
             $this->file->getErrors()
         );

From 6a404be1eb4dfbfe3ba28013a3f783c30a64e72f Mon Sep 17 00:00:00 2001
From: Giuseppe Mazzapica <giuseppe.mazzapica@gmail.com>
Date: Sat, 26 Aug 2023 00:29:04 +0200
Subject: [PATCH 14/18] Make use of reusable workflows for QA

---
 .github/workflows/php-qa.yml                | 76 ---------------------
 .github/workflows/quality-assurance-php.yml | 51 ++++++++++++++
 2 files changed, 51 insertions(+), 76 deletions(-)
 delete mode 100644 .github/workflows/php-qa.yml
 create mode 100644 .github/workflows/quality-assurance-php.yml

diff --git a/.github/workflows/php-qa.yml b/.github/workflows/php-qa.yml
deleted file mode 100644
index 8cf444a..0000000
--- a/.github/workflows/php-qa.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: PHP Quality Assurance
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-jobs:
-  static-qa:
-    runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, 'no static qa') }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.4
-          coverage: none
-          tools: cs2pr
-
-      - name: Install dependencies
-        uses: ramsey/composer-install@v2
-
-      - name: Check code styles
-        run: |
-          ./vendor/bin/phpcs -q --report-full --report-checkstyle="phpcs-report.xml"  --runtime-set testVersion 7.0- --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1
-          cs2pr --graceful-warnings phpcs-report.xml
-
-      - name: Check Psalm
-        run: ./vendor/bin/psalm --output-format=github --no-cache
-
-  unit-tests:
-    runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, 'no unit tests') }}
-    strategy:
-      fail-fast: true
-      matrix:
-        php-ver: [ '7.4', '8.0', '8.1', '8.2' ]
-        deps-mode: [ 'lowest', 'highest' ]
-        include:
-          - php-ver: '8.1'
-            dependency-versions: 'highest'
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-ver }}
-          ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
-          coverage: none
-          tools: cs2pr, parallel-lint:^1.3.1
-
-      - name: Check syntax error in sources
-        if: ${{ (matrix.deps-mode == 'highest') }}
-        run: parallel-lint ./Inpsyde/ ./tests/src/ ./tests/cases/ --checkstyle | cs2pr
-
-      - name: Remove Psalm before tests to prevent installation conflicts
-        run: composer remove vimeo/psalm --no-update
-
-      - name: Install dependencies
-        uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: ${{ matrix.deps-mode }}
-
-      - name: Migrate PHPUnit config for PHPUnit 9
-        if: ${{ (matrix.php-ver >= 7.3) && (matrix.deps-mode == 'highest') }}
-        run: ./vendor/bin/phpunit --migrate-configuration
-
-      - name: Run unit tests
-        run: ./vendor/bin/phpunit --testsuite=unit --no-coverage
diff --git a/.github/workflows/quality-assurance-php.yml b/.github/workflows/quality-assurance-php.yml
new file mode 100644
index 0000000..cee505f
--- /dev/null
+++ b/.github/workflows/quality-assurance-php.yml
@@ -0,0 +1,51 @@
+name: PHP Quality Assurance
+
+on:
+    push:
+        paths:
+            - '**workflows/quality-assurance-php.yml'
+            - '**.php'
+            - '**phpcs.xml.dist'
+            - '**phpunit.xml.dist'
+            - '**psalm.xml'
+    workflow_dispatch:
+        inputs:
+            jobs:
+                required: true
+                type: choice
+                default: 'Run all'
+                description: 'Choose jobs to run'
+                options:
+                    - 'Run all'
+                    - 'Run PHPCS only'
+                    - 'Run Psalm only'
+                    - 'Run lint only'
+                    - 'Run static analysis'
+                    - 'Run unit tests only'
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+jobs:
+    lint-php:
+        uses: inpsyde/reusable-workflows/.github/workflows/lint-php.yml@main
+        if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run lint only') || (github.event.inputs.jobs == 'Run static analysis')) }}
+        with:
+            PHP_MATRIX: '["7.4", "8.0", "8.1", "8.2"]'
+            LINT_ARGS: '-e php --colors --show-deprecated ./Inpsyde'
+
+    coding-standards-analysis-php:
+        if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run PHPCS only') || (github.event.inputs.jobs == 'Run static analysis')) }}
+        uses: inpsyde/reusable-workflows/.github/workflows/coding-standards-php.yml@main
+
+    static-code-analysis-php:
+        if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run Psalm only') || (github.event.inputs.jobs == 'Run static analysis')) }}
+        uses: inpsyde/reusable-workflows/.github/workflows/static-analysis-php.yml@main
+
+    tests-unit-php:
+        if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run unit tests only')) }}
+        uses: inpsyde/reusable-workflows/.github/workflows/tests-unit-php.yml@main
+        with:
+            PHP_MATRIX: '["7.4", "8.0", "8.1", "8.2"]'
+            PHPUNIT_ARGS: '--no-coverage'

From 9bf1e9ca1d184388b0bd8889d451d0c860f58cb1 Mon Sep 17 00:00:00 2001
From: Giuseppe Mazzapica <giuseppe.mazzapica@gmail.com>
Date: Sat, 26 Aug 2023 00:54:50 +0200
Subject: [PATCH 15/18] Fix CS

---
 Inpsyde/PhpcsHelpers.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Inpsyde/PhpcsHelpers.php b/Inpsyde/PhpcsHelpers.php
index 27c5403..f33f8f1 100644
--- a/Inpsyde/PhpcsHelpers.php
+++ b/Inpsyde/PhpcsHelpers.php
@@ -540,13 +540,8 @@ public static function returnsCountInfo(File $file, int $position): array
         /** @var array<int, array<string, mixed>> $tokens */
         $tokens = $file->getTokens();
 
-        if (T_FN === $tokens[$position]['code'] ?? null) {
-            return [
-                'nonEmpty' => 1,
-                'void' => 0,
-                'null' => 0,
-                'total' => 1,
-            ];
+        if (T_FN === ($tokens[$position]['code'] ?? null)) {
+            return ['nonEmpty' => 1, 'void' => 0, 'null' => 0, 'total' => 1];
         }
 
         $pos = $start + 1;

From 2ec02f5ab7f13251ee7860ce78db5ee999ac7043 Mon Sep 17 00:00:00 2001
From: Giuseppe Mazzapica <giuseppe.mazzapica@gmail.com>
Date: Sat, 26 Aug 2023 01:04:12 +0200
Subject: [PATCH 16/18] Fix tests

---
 .../CodeQuality/ArgumentTypeDeclarationSniff.php    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php b/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php
index 34dc9fb..7afdbb0 100644
--- a/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php
@@ -52,12 +52,13 @@ public function process(File $phpcsFile, $stackPtr): void
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
         // phpcs:enable Generic.Metrics.CyclomaticComplexity
 
-        if ($this->shouldIgnore($phpcsFile, $stackPtr)) {
+        /** @var array<int, array<string, mixed>> $tokens */
+        $tokens = $phpcsFile->getTokens();
+
+        if ($this->shouldIgnore($phpcsFile, $stackPtr, $tokens)) {
             return;
         }
 
-        /** @var array<int, array<string, mixed>> $tokens */
-        $tokens = $phpcsFile->getTokens();
         $paramsStart = (int)($tokens[$stackPtr]['parenthesis_opener'] ?? 0);
         $paramsEnd = (int)($tokens[$stackPtr]['parenthesis_closer'] ?? 0);
 
@@ -91,15 +92,17 @@ public function process(File $phpcsFile, $stackPtr): void
     /**
      * @param File $phpcsFile
      * @param int $stackPtr
+     * @param array<int, array<string, mixed>> $tokens
      * @return bool
      *
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
      */
-    private function shouldIgnore(File $phpcsFile, $stackPtr): bool
+    private function shouldIgnore(File $phpcsFile, $stackPtr, array $tokens): bool
     {
         // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
 
-        $name = $phpcsFile->getDeclarationName($stackPtr);
+        $tokenCode = $tokens[$stackPtr]['code'] ?? '';
+        $name = ($tokenCode !== T_FN) ? ($phpcsFile->getDeclarationName($stackPtr) ?: '') : '';
 
         return PhpcsHelpers::functionIsArrayAccess($phpcsFile, $stackPtr)
             || PhpcsHelpers::isHookClosure($phpcsFile, $stackPtr)

From 8c92e990403adc62aafa7c5ceb4e55ba6916cd62 Mon Sep 17 00:00:00 2001
From: Giuseppe Mazzapica <giuseppe.mazzapica@gmail.com>
Date: Sat, 26 Aug 2023 01:15:23 +0200
Subject: [PATCH 17/18] Add support for static short closures

---
 Inpsyde/PhpcsHelpers.php                      | 38 ++++++++++---------
 .../Sniffs/CodeQuality/StaticClosureSniff.php |  4 +-
 tests/fixtures/static-closure.php             | 14 +++++++
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/Inpsyde/PhpcsHelpers.php b/Inpsyde/PhpcsHelpers.php
index f33f8f1..64dde5a 100644
--- a/Inpsyde/PhpcsHelpers.php
+++ b/Inpsyde/PhpcsHelpers.php
@@ -342,7 +342,7 @@ public static function functionDocBlockTags(
 
         if (
             !array_key_exists($position, $tokens)
-            || !in_array($tokens[$position]['code'], [T_FUNCTION, T_CLOSURE], true)
+            || !in_array($tokens[$position]['code'], [T_FUNCTION, T_CLOSURE, T_FN], true)
         ) {
             return [];
         }
@@ -480,7 +480,7 @@ public static function functionBody(File $file, int $position): string
     /**
      * @param File $file
      * @param int $position
-     * @return array{int, int}
+     * @return list{int, int}
      */
     public static function functionBoundaries(File $file, int $position): array
     {
@@ -491,19 +491,13 @@ public static function functionBoundaries(File $file, int $position): array
             return [-1, -1];
         }
 
-        $functionStart = (int)($tokens[$position]['scope_opener'] ?? 0);
-        $functionEnd = (int)($tokens[$position]['scope_closer'] ?? 0);
-        if ($functionStart <= 0 || $functionEnd <= 0 || $functionStart >= ($functionEnd - 1)) {
-            return [-1, -1];
-        }
-
-        return [$functionStart, $functionEnd];
+        return static::boundaries($tokens, $position);
     }
 
     /**
      * @param File $file
      * @param int $position
-     * @return array{int, int}
+     * @return list{int, int}
      */
     public static function classBoundaries(File $file, int $position): array
     {
@@ -514,13 +508,7 @@ public static function classBoundaries(File $file, int $position): array
             return [-1, -1];
         }
 
-        $start = (int)($tokens[$position]['scope_opener'] ?? 0);
-        $end = (int)($tokens[$position]['scope_closer'] ?? 0);
-        if ($start <= 0 || $end <= 0 || $start >= ($end - 1)) {
-            return [-1, -1];
-        }
-
-        return [$start, $end];
+        return static::boundaries($tokens, $position);
     }
 
     /**
@@ -728,4 +716,20 @@ public static function isUntypedPsrMethod(File $file, int $position): bool
 
         return false;
     }
+
+    /**
+     * @param array<int, array<string, mixed>> $tokens
+     * @param int $position
+     * @return list{int, int}
+     */
+    private static function boundaries(array $tokens, int $position): array
+    {
+        $start = (int)($tokens[$position]['scope_opener'] ?? 0);
+        $end = (int)($tokens[$position]['scope_closer'] ?? 0);
+        if ($start <= 0 || $end <= 0 || $start >= ($end - 1)) {
+            return [-1, -1];
+        }
+
+        return [$start, $end];
+    }
 }
diff --git a/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php b/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php
index fe31154..e9d62bd 100644
--- a/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php
+++ b/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php
@@ -11,11 +11,11 @@
 class StaticClosureSniff implements Sniff
 {
     /**
-     * @return list<string>
+     * @return list<int|string>
      */
     public function register(): array
     {
-        return [T_CLOSURE];
+        return [T_CLOSURE, T_FN];
     }
 
     /**
diff --git a/tests/fixtures/static-closure.php b/tests/fixtures/static-closure.php
index 9460d49..3aa137c 100644
--- a/tests/fixtures/static-closure.php
+++ b/tests/fixtures/static-closure.php
@@ -32,6 +32,10 @@ function () {
     return $foo;
 };
 
+fn() => $this;
+
+static fn() => 'Foo';
+
 static function () {
     return 'Foo';
 };
@@ -60,6 +64,8 @@ public function b()
             return 'Foo';
         };
 
+        $a = fn () => 'x'; // @phpcsWarningOnThisLine
+
         return $a;
     }
 
@@ -80,5 +86,13 @@ function () {
         function () {
             return 'Foo';
         };
+
+        /** @bound */
+        fn() => 'Foo';
+
+        fn() => $this;
     }
 }
+
+add_filter('x', fn() => 'y'); // @phpcsWarningOnThisLine
+add_filter('x', static fn() => 'y');

From efa0869589b2e72613c4fde94dbdc2ffa32a208f Mon Sep 17 00:00:00 2001
From: Giuseppe Mazzapica <giuseppe.mazzapica@gmail.com>
Date: Sat, 26 Aug 2023 01:27:03 +0200
Subject: [PATCH 18/18] Update branch alias

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 909ae1b..ea4c1a9 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-version/1": "1.x-dev",
+            "dev-version/2": "2.x-dev"
         }
     },
     "scripts" : {