From da404da2758d36a867e51ddff7eb475cdc83a294 Mon Sep 17 00:00:00 2001 From: Max Antipin Date: Wed, 15 Jul 2026 22:58:10 +0300 Subject: [PATCH] Update squizlabs/php_codesniffer to version 4 --- AntipinCS/Sniffs/Classes/PropertyTypeDeclarationSniff.php | 6 +++--- .../Sniffs/Functions/ParameterTypeDeclarationSniff.php | 2 +- AntipinCS/Sniffs/Functions/ReturnTypeDeclarationSniff.php | 5 +++-- .../Tests/Functions/ParameterTypeDeclarationUnitTest.php | 2 +- AntipinCS/Tests/Functions/ReturnTypeDeclarationUnitTest.php | 2 +- composer.json | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/AntipinCS/Sniffs/Classes/PropertyTypeDeclarationSniff.php b/AntipinCS/Sniffs/Classes/PropertyTypeDeclarationSniff.php index d69b3ae..edaf264 100644 --- a/AntipinCS/Sniffs/Classes/PropertyTypeDeclarationSniff.php +++ b/AntipinCS/Sniffs/Classes/PropertyTypeDeclarationSniff.php @@ -17,7 +17,7 @@ class PropertyTypeDeclarationSniff extends AbstractVariableSniff { - protected function processMemberVar(File $phpcsFile, $stackPtr): void + protected function processMemberVar(File $phpcsFile, int $stackPtr): void { $tokens = $phpcsFile->getTokens(); @@ -66,7 +66,7 @@ protected function processMemberVar(File $phpcsFile, $stackPtr): void * * @return void */ - protected function processVariable(File $phpcsFile, $stackPtr): void + protected function processVariable(File $phpcsFile, int $stackPtr): void { /* We don't care about normal variables. @@ -81,7 +81,7 @@ protected function processVariable(File $phpcsFile, $stackPtr): void * * @return void */ - protected function processVariableInString(File $phpcsFile, $stackPtr): void + protected function processVariableInString(File $phpcsFile, int $stackPtr): void { /* We don't care about normal variables. diff --git a/AntipinCS/Sniffs/Functions/ParameterTypeDeclarationSniff.php b/AntipinCS/Sniffs/Functions/ParameterTypeDeclarationSniff.php index 16120a5..a21f70d 100644 --- a/AntipinCS/Sniffs/Functions/ParameterTypeDeclarationSniff.php +++ b/AntipinCS/Sniffs/Functions/ParameterTypeDeclarationSniff.php @@ -45,7 +45,7 @@ public function register(): array ]; } - public function process(File $phpcsFile, $stackPtr): void + public function process(File $phpcsFile, int $stackPtr): void { $tokens = $phpcsFile->getTokens(); $token = $tokens[$stackPtr]; diff --git a/AntipinCS/Sniffs/Functions/ReturnTypeDeclarationSniff.php b/AntipinCS/Sniffs/Functions/ReturnTypeDeclarationSniff.php index b0de00b..51eb48b 100644 --- a/AntipinCS/Sniffs/Functions/ReturnTypeDeclarationSniff.php +++ b/AntipinCS/Sniffs/Functions/ReturnTypeDeclarationSniff.php @@ -24,7 +24,7 @@ public function register(): array ]; } - public function process(File $phpcsFile, $stackPtr): void + public function process(File $phpcsFile, int $stackPtr): void { $tokens = $phpcsFile->getTokens(); $token = $tokens[$stackPtr]; @@ -36,9 +36,10 @@ public function process(File $phpcsFile, $stackPtr): void ); return; } + static $skipTypes = ['T_CLOSURE' => true, 'T_FN' => true]; static $skipMethods = ['__construct' => true, '__destruct' => true]; if ( - $token['code'] !== 311 + !isset($skipTypes[$token['type']]) && ($methodName = $phpcsFile->getDeclarationName($stackPtr)) !== null && isset($skipMethods[$methodName]) ) { diff --git a/AntipinCS/Tests/Functions/ParameterTypeDeclarationUnitTest.php b/AntipinCS/Tests/Functions/ParameterTypeDeclarationUnitTest.php index 00d4916..a24164a 100644 --- a/AntipinCS/Tests/Functions/ParameterTypeDeclarationUnitTest.php +++ b/AntipinCS/Tests/Functions/ParameterTypeDeclarationUnitTest.php @@ -26,7 +26,7 @@ final class ParameterTypeDeclarationUnitTest extends AbstractSniffUnitTest * * @return string[] */ - protected function getTestFiles($testFileBase): array + protected function getTestFiles(string $testFileBase): array { return array_map(static fn (int $i): string => $testFileBase . $i . '.inc', range(1, 4)); } diff --git a/AntipinCS/Tests/Functions/ReturnTypeDeclarationUnitTest.php b/AntipinCS/Tests/Functions/ReturnTypeDeclarationUnitTest.php index 554831d..d0cf003 100644 --- a/AntipinCS/Tests/Functions/ReturnTypeDeclarationUnitTest.php +++ b/AntipinCS/Tests/Functions/ReturnTypeDeclarationUnitTest.php @@ -24,7 +24,7 @@ final class ReturnTypeDeclarationUnitTest extends AbstractSniffUnitTest * * @return string[] */ - protected function getTestFiles($testFileBase): array + protected function getTestFiles(string $testFileBase): array { return array_map(static fn (int $i): string => $testFileBase . $i . '.inc', range(1, 2)); } diff --git a/composer.json b/composer.json index cb3f054..ae4c395 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "license": "Unlicense", "require": { "php": ">=8.4", - "squizlabs/php_codesniffer": "^3.13", + "squizlabs/php_codesniffer": "^4", "dealerdirect/phpcodesniffer-composer-installer": "^1.2" }, "require-dev": {