diff --git a/composer.json b/composer.json index cc2615b..1d76fa2 100644 --- a/composer.json +++ b/composer.json @@ -21,9 +21,9 @@ }, "require-dev": { "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.0.0", - "phpstan/phpstan-phpunit": "^1.0.0", - "phpstan/phpstan-strict-rules": "^1.0.0", + "phpstan/phpstan": "^2.0.0", + "phpstan/phpstan-phpunit": "^2.0.0", + "phpstan/phpstan-strict-rules": "^2.0.0", "phpunit/phpunit": "^11.0" }, "config": { diff --git a/src/Cdn77/Sniffs/NamingConventions/ValidConstantNameSniff.php b/src/Cdn77/Sniffs/NamingConventions/ValidConstantNameSniff.php index d13a809..5d90512 100644 --- a/src/Cdn77/Sniffs/NamingConventions/ValidConstantNameSniff.php +++ b/src/Cdn77/Sniffs/NamingConventions/ValidConstantNameSniff.php @@ -55,6 +55,7 @@ public function register(): array */ public function process(File $phpcsFile, $stackPtr): void { + /** @var array $tokens */ $tokens = $phpcsFile->getTokens(); if ($tokens[$stackPtr]['code'] === T_CONST) { diff --git a/src/Cdn77/Sniffs/NamingConventions/ValidVariableNameSniff.php b/src/Cdn77/Sniffs/NamingConventions/ValidVariableNameSniff.php index 6133500..693af85 100644 --- a/src/Cdn77/Sniffs/NamingConventions/ValidVariableNameSniff.php +++ b/src/Cdn77/Sniffs/NamingConventions/ValidVariableNameSniff.php @@ -42,6 +42,7 @@ class ValidVariableNameSniff extends AbstractVariableSniff */ protected function processVariable(File $phpcsFile, $stackPtr): void { + /** @var array $tokens */ $tokens = $phpcsFile->getTokens(); $varName = ltrim($tokens[$stackPtr]['content'], '$'); @@ -105,6 +106,7 @@ protected function processVariable(File $phpcsFile, $stackPtr): void */ protected function processMemberVar(File $phpcsFile, $stackPtr): void { + /** @var array $tokens */ $tokens = $phpcsFile->getTokens(); $varName = ltrim($tokens[$stackPtr]['content'], '$'); @@ -137,6 +139,7 @@ protected function processMemberVar(File $phpcsFile, $stackPtr): void */ protected function processVariableInString(File $phpcsFile, $stackPtr): void { + /** @var array $tokens */ $tokens = $phpcsFile->getTokens(); if ( diff --git a/src/Cdn77/Sniffs/Ordering/AlphabeticallyOrderedConstantsSniff.php b/src/Cdn77/Sniffs/Ordering/AlphabeticallyOrderedConstantsSniff.php index b1f3038..e656623 100644 --- a/src/Cdn77/Sniffs/Ordering/AlphabeticallyOrderedConstantsSniff.php +++ b/src/Cdn77/Sniffs/Ordering/AlphabeticallyOrderedConstantsSniff.php @@ -139,6 +139,7 @@ private function fix(File $file, array $namesWithValues): void private function findConstantNamesWithValuesByVisibility(File $phpcsFile): array { $constantNamesWithValues = []; + /** @var array $tokens */ $tokens = $phpcsFile->getTokens(); foreach ($tokens as $stackPtr => $token) { @@ -177,6 +178,7 @@ private function findConstantNamesWithValuesByVisibility(File $phpcsFile): array private function getVisibility(File $phpcsFile, int $constStackPtr): string { + /** @var array $tokens */ $tokens = $phpcsFile->getTokens(); $visibilityTokenPointer = $phpcsFile->findPrevious( types: Tokens::$emptyTokens, @@ -186,13 +188,14 @@ private function getVisibility(File $phpcsFile, int $constStackPtr): string ); return in_array($tokens[$visibilityTokenPointer]['code'], [T_PUBLIC, T_PROTECTED, T_PRIVATE], true) - ? (string) $tokens[$visibilityTokenPointer]['content'] + ? $tokens[$visibilityTokenPointer]['content'] : 'public'; } /** @phpstan-return TypeNameShape|null */ private function findTypeAndConstantName(File $phpcsFile, int $constStackPtr): array|null { + /** @var array $tokens */ $tokens = $phpcsFile->getTokens(); $assignmentOperatorTokenPtr = $phpcsFile->findNext( types: [T_EQUAL, T_SEMICOLON], @@ -241,6 +244,7 @@ private function findTypeAndConstantName(File $phpcsFile, int $constStackPtr): a private function findEqualsPointer(File $phpcsFile, int $constNameStackPtr): int|null { + /** @var array $tokens */ $tokens = $phpcsFile->getTokens(); $equalsTokenPointer = $phpcsFile->findNext( types: Tokens::$emptyTokens, @@ -259,6 +263,7 @@ private function findEqualsPointer(File $phpcsFile, int $constNameStackPtr): int /** @phpstan-return ValueShape|null */ private function findValue(File $phpcsFile, int $equalsTokenPointer): array|null { + /** @var array $tokens */ $tokens = $phpcsFile->getTokens(); $startValueTokenPointer = $phpcsFile->findNext( types: Tokens::$emptyTokens, diff --git a/tests/TestCase.php b/tests/TestCase.php index 073df3c..b101446 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -81,6 +81,7 @@ protected static function checkFile(string $filePath, array $sniffProperties = [ private static function getSniffClassReflection(): ReflectionClass { + /** @var array> $reflections */ static $reflections = []; $className = static::getSniffClassName();