Update sniffs to PHPCS v4.

dereuromark · dereuromark · commit bffa7c052bff · 2025-09-18T09:36:20.000+02:00
diff --git a/PSR2R/Sniffs/Commenting/DocBlockParamSniff.php b/PSR2R/Sniffs/Commenting/DocBlockParamSniff.php
@@ -145,7 +145,7 @@ private function getMethodSignature(File $phpCsFile, int $stackPtr): array {
 		while ($nextVariableIndex = $phpCsFile->findNext(T_VARIABLE, $i + 1, $endIndex)) {
 			$typehint = $default = null;
 			$possibleTypeHint =
-				$phpCsFile->findPrevious([T_ARRAY_HINT, T_CALLABLE], $nextVariableIndex - 1, $nextVariableIndex - 3);
+				$phpCsFile->findPrevious([T_ARRAY, T_CALLABLE], $nextVariableIndex - 1, $nextVariableIndex - 3);
 			if ($possibleTypeHint) {
 				$typehint = $possibleTypeHint;
 			}
diff --git a/PSR2R/Sniffs/Methods/MethodDeclarationSniff.php b/PSR2R/Sniffs/Methods/MethodDeclarationSniff.php
@@ -51,7 +51,7 @@ protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScop
 		$tokens = $phpcsFile->getTokens();
 
 		$methodName = $phpcsFile->getDeclarationName($stackPtr);
-		if ($methodName === null) {
+		if (!$methodName) {
 			// Ignore closures.
 			return;
 		}
diff --git a/PSR2R/Sniffs/Namespaces/NoInlineFullyQualifiedClassNameSniff.php b/PSR2R/Sniffs/Namespaces/NoInlineFullyQualifiedClassNameSniff.php
@@ -772,7 +772,7 @@ protected function checkUseForReturnTypeHint(File $phpcsFile, int $stackPtr): vo
 		$extractedUseStatement = '';
 		$lastSeparatorIndex = null;
 		while (true) {
-			if (!$this->isGivenKind([T_NS_SEPARATOR, T_STRING, T_RETURN_TYPE], $tokens[$j])) {
+			if (!$this->isGivenKind([T_NS_SEPARATOR, T_STRING], $tokens[$j])) {
 				break;
 			}
 
diff --git a/PSR2R/Tools/Traits/SignatureTrait.php b/PSR2R/Tools/Traits/SignatureTrait.php
@@ -25,7 +25,7 @@ protected function getMethodSignature(File $phpCsFile, int $stackPtr): array {
 		$i = $startIndex;
 		while ($nextVariableIndex = $phpCsFile->findNext(T_VARIABLE, $i + 1, $endIndex)) {
 			$typehintIndex = $defaultIndex = $default = null;
-			$possibleTypeHint = $phpCsFile->findPrevious([T_ARRAY_HINT, T_CALLABLE], $nextVariableIndex - 1, $nextVariableIndex - 3);
+			$possibleTypeHint = $phpCsFile->findPrevious([T_ARRAY, T_CALLABLE], $nextVariableIndex - 1, $nextVariableIndex - 3);
 			if ($possibleTypeHint) {
 				$typehintIndex = $possibleTypeHint;
 			}
diff --git a/PSR2R/ruleset.xml b/PSR2R/ruleset.xml
@@ -18,6 +18,7 @@
 	<exclude-pattern>\.json</exclude-pattern>
 
 	<config name="installed_paths" value="../../slevomat/coding-standard,../../php-collective/code-sniffer,../../phpcsstandards/phpcsextra"/>
+	<config name="php_version" value="80100"/>
 
 	<arg name="tab-width" value="4"/>
 
diff --git a/composer.json b/composer.json
@@ -13,13 +13,14 @@
 	],
 	"require": {
 		"php": ">=8.1",
-		"php-collective/code-sniffer": "^0.3.0",
-		"slevomat/coding-standard": "^8.16.0",
-		"squizlabs/php_codesniffer": "^3.7.0"
+		"php-collective/code-sniffer": "dev-next",
+		"slevomat/coding-standard": "dev-phpcs4",
+		"squizlabs/php_codesniffer": "^4.0.0"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^10.3 || ^11.5 || ^12.0",
-		"phpstan/phpstan": "^2.1.0"
+		"phpstan/phpstan": "^2.1.0",
+		"dealerdirect/phpcodesniffer-composer-installer": "^1.0"
 	},
 	"autoload": {
 		"psr-4": {
@@ -32,7 +33,7 @@
 		}
 	},
 	"prefer-stable": true,
-	"minimum-stability": "stable",
+	"minimum-stability": "dev",
 	"bin": [
 		"bin/tokenize",
 		"bin/sniff"
diff --git a/phpcs.xml b/phpcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ruleset name="code-sniffer">
-    <config name="installed_paths" value="../../fig-r/psr2r-sniffer"/>
+    <config name="installed_paths" value="vendor/slevomat/coding-standard,vendor/php-collective/code-sniffer,vendor/phpcsstandards/phpcsextra,vendor/phpcsstandards/phpcsutils"/>
 
     <arg value="nps"/>
 

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ private function getMethodSignature(File $phpCsFile, int $stackPtr): array {`
`145`	`145`	`while ($nextVariableIndex = $phpCsFile->findNext(T_VARIABLE, $i + 1, $endIndex)) {`
`146`	`146`	`$typehint = $default = null;`
`147`	`147`	`$possibleTypeHint =`
`148`		`- $phpCsFile->findPrevious([T_ARRAY_HINT, T_CALLABLE], $nextVariableIndex - 1, $nextVariableIndex - 3);`
	`148`	`+ $phpCsFile->findPrevious([T_ARRAY, T_CALLABLE], $nextVariableIndex - 1, $nextVariableIndex - 3);`
`149`	`149`	`if ($possibleTypeHint) {`
`150`	`150`	`$typehint = $possibleTypeHint;`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScop`
`51`	`51`	`$tokens = $phpcsFile->getTokens();`
`52`	`52`
`53`	`53`	`$methodName = $phpcsFile->getDeclarationName($stackPtr);`
`54`		`- if ($methodName === null) {`
	`54`	`+ if (!$methodName) {`
`55`	`55`	`// Ignore closures.`
`56`	`56`	`return;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ protected function checkUseForReturnTypeHint(File $phpcsFile, int $stackPtr): vo`
`772`	`772`	`$extractedUseStatement = '';`
`773`	`773`	`$lastSeparatorIndex = null;`
`774`	`774`	`while (true) {`
`775`		`- if (!$this->isGivenKind([T_NS_SEPARATOR, T_STRING, T_RETURN_TYPE], $tokens[$j])) {`
	`775`	`+ if (!$this->isGivenKind([T_NS_SEPARATOR, T_STRING], $tokens[$j])) {`
`776`	`776`	`break;`
`777`	`777`	`}`
`778`	`778`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected function getMethodSignature(File $phpCsFile, int $stackPtr): array {`
`25`	`25`	`$i = $startIndex;`
`26`	`26`	`while ($nextVariableIndex = $phpCsFile->findNext(T_VARIABLE, $i + 1, $endIndex)) {`
`27`	`27`	`$typehintIndex = $defaultIndex = $default = null;`
`28`		`- $possibleTypeHint = $phpCsFile->findPrevious([T_ARRAY_HINT, T_CALLABLE], $nextVariableIndex - 1, $nextVariableIndex - 3);`
	`28`	`+ $possibleTypeHint = $phpCsFile->findPrevious([T_ARRAY, T_CALLABLE], $nextVariableIndex - 1, $nextVariableIndex - 3);`
`29`	`29`	`if ($possibleTypeHint) {`
`30`	`30`	`$typehintIndex = $possibleTypeHint;`
`31`	`31`	`}`