Merge pull request #43 from KateSyrotchuk/fix-unused-imports

fix sniffs after update escapestudios/symfony2-coding-standard

Author: ZhukV

.github/workflows/tests.yaml

@@ -18,7 +18,7 @@ jobs:
                 with:
                     coverage: "none"
                     ini-values: "memory_limit=-1"
-                    php-version: "8.2"
+                    php-version: "8.4"
                     tools: "composer"
 
             -   name: Install vendors
@@ -43,7 +43,7 @@ jobs:
                 with:
                     coverage: "none"
                     ini-values: "memory_limit=-1"
-                    php-version: "8.2"
+                    php-version: "8.4"
                     tools: "composer"
 
             -   name: Install vendors
@@ -58,7 +58,7 @@ jobs:
 
         strategy:
             matrix:
-                php: [ '8.2', '8.3', '8.4' ]
+                php: [ '8.4', '8.5' ]
 
         steps:
             -   name: Checkout

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.2-cli
+FROM php:8.4-cli
 
 LABEL org.opencontainers.image.authors="Vitalii Zhuk <v.zhuk@fivelab.org>"
 

composer.json

@@ -18,13 +18,17 @@
     ],
 
     "require": {
-        "php": "~8.2"
+        "php": "~8.4"
+    },
+
+    "conflict": {
+        "squizlabs/php_codesniffer": "<4"
     },
 
     "require-dev": {
         "phpunit/phpunit": "~11.0",
         "phpstan/phpstan": "~2.0",
-        "escapestudios/symfony2-coding-standard": "~3.13"
+        "escapestudios/symfony2-coding-standard": "~3.17"
     },
 
     "suggest": {

src/PhpCs/FiveLab/PhpCsUtils.php

@@ -61,15 +61,15 @@ public static function getDiffLines(File $file, int $fromPtr, int $toPtr): int
 
             if ($token['code'] === T_WHITESPACE && $token['content'] === $file->eolChar) {
                 $diffLines++;
-            } elseif (\in_array($token['code'], Tokens::$commentTokens, true)) {
+            } elseif (\in_array($token['code'], Tokens::COMMENT_TOKENS, true)) {
                 if ($token['code'] === T_DOC_COMMENT_OPEN_TAG) {
                     $i = $file->findNext([T_DOC_COMMENT_CLOSE_TAG], $i + 1);
                 } elseif ($token['code'] === T_COMMENT) {
                     $tokensOnLine = self::getTokensOnLine($file, $token['line']);
                     $existCodeOnLine = false;
 
                     foreach ($tokensOnLine as $tokenOnLine) {
-                        if (!\in_array($tokenOnLine['code'], Tokens::$emptyTokens, true)) {
+                        if (!\in_array($tokenOnLine['code'], Tokens::EMPTY_TOKENS, true)) {
                             $existCodeOnLine = true;
                         }
                     }
@@ -146,7 +146,7 @@ public static function getDeclaredClassName(File $file): ?string
         if ($nsStart) {
             $nsEnd = $file->findNext([T_NS_SEPARATOR, T_STRING, T_WHITESPACE], $nsStart + 1, null, true);
 
-            $namespace = \trim(self::getContentsBetweenPtrs($file, $nsStart + 1, (int) $nsEnd));
+            $namespace = \trim(self::getContentsBetweenPtrs($file, $nsStart + 1, (int) $nsEnd + 1));
         }
 
         $declaredPtr = $file->findNext([T_CLASS, T_INTERFACE, T_TRAIT], 0);

src/PhpCs/FiveLab/Sniffs/AbstractFunctionCallSniff.php

@@ -24,14 +24,14 @@ abstract class AbstractFunctionCallSniff implements Sniff
 {
     public function register(): array
     {
-        return Tokens::$functionNameTokens;
+        return Tokens::FUNCTION_NAME_TOKENS;
     }
 
     final public function process(File $phpcsFile, mixed $stackPtr): void
     {
         $tokens = $phpcsFile->getTokens();
 
-        $ignoreTokens = Tokens::$emptyTokens;
+        $ignoreTokens = Tokens::EMPTY_TOKENS;
         $ignoreTokens[] = T_BITWISE_AND;
 
         $specialKeywordPtr = $phpcsFile->findPrevious($ignoreTokens, $stackPtr - 1, null, true);
@@ -42,7 +42,7 @@ final public function process(File $phpcsFile, mixed $stackPtr): void
             return;
         }
 
-        $openParenthesisPtr = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true);
+        $openParenthesisPtr = $phpcsFile->findNext(Tokens::EMPTY_TOKENS, $stackPtr + 1, null, true);
 
         if (!$openParenthesisPtr || $tokens[$openParenthesisPtr]['code'] !== T_OPEN_PARENTHESIS) {
             return;

src/PhpCs/FiveLab/Sniffs/Formatting/MultiLineSniff.php

@@ -46,7 +46,7 @@ public function process(File $phpcsFile, mixed $stackPtr): void
                 return (string) $token['code'];
             }, PhpCsUtils::getTokensOnLine($phpcsFile, $stmt['line']));
 
-            $diff = \array_values(\array_diff($lineTokens, Tokens::$emptyTokens));
+            $diff = \array_values(\array_diff($lineTokens, Tokens::EMPTY_TOKENS));
 
             $then = \array_search(T_INLINE_THEN, $diff);
             $else = \array_search(T_INLINE_ELSE, $diff);

src/PhpCs/FiveLab/Sniffs/Formatting/SemicolonSingleCharSniff.php

@@ -37,7 +37,7 @@ public function process(File $phpcsFile, mixed $stackPtr): void
             return (string) $token['code'];
         }, PhpCsUtils::getTokensOnLine($phpcsFile, $phpcsFile->getTokens()[$stackPtr]['line']));
 
-        $diff = \array_diff($tokens, Tokens::$emptyTokens);
+        $diff = \array_diff($tokens, Tokens::EMPTY_TOKENS);
 
         if (1 === \count($diff)) {
             $phpcsFile->addError(

src/PhpCs/FiveLab/Sniffs/Formatting/ThrowSniff.php

@@ -34,7 +34,7 @@ public function register(): array
     public function process(File $phpcsFile, mixed $stackPtr): void
     {
         // Check blank lines before
-        $prevTokenPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $stackPtr - 1, null, true);
+        $prevTokenPtr = $phpcsFile->findPrevious(Tokens::EMPTY_TOKENS, $stackPtr - 1, null, true);
 
         $prevToken = $phpcsFile->getTokens()[$prevTokenPtr];
         $diffLinesBefore = PhpCsUtils::getDiffLines($phpcsFile, (int) $prevTokenPtr, $stackPtr);
@@ -67,7 +67,7 @@ private function checkSprintfOnSameLine(File $phpcsFile, int $stackPtr): void
         }
 
         $endOfMessagePtr = $phpcsFile->findNext([T_COMMA, T_SEMICOLON], $openParenthesisPtr);
-        $sprintfTokenPtr = $phpcsFile->findNext([], $openParenthesisPtr, (int) $endOfMessagePtr, true, 'sprintf', true);
+        $sprintfTokenPtr = $phpcsFile->findNext([], $openParenthesisPtr, (int) $endOfMessagePtr, true, '\sprintf', true);
 
         if ($sprintfTokenPtr) {
             $tokens = $phpcsFile->getTokens();

src/PhpCs/FiveLab/Sniffs/Formatting/UnusedImportsSniff.php

@@ -54,6 +54,9 @@ public function process(File $phpcsFile, mixed $stackPtr): void
 
         $import = $tokens[$currentStackPtr - 1]['content'];
 
+        $parts = \explode('\\', $import);
+        $import = \end($parts);
+
         $importStackPtr = $stackPtr;
 
         while ($currentStackPtr = $phpcsFile->findNext(T_USE, ++$currentStackPtr)) {

src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundControlStatementSniff.php

@@ -69,13 +69,13 @@ public function process(File $phpcsFile, mixed $stackPtr): void
         }
 
         // Check blank lines before statement
-        $prevTokenPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $stackPtr - 1, null, true);
+        $prevTokenPtr = $phpcsFile->findPrevious(Tokens::EMPTY_TOKENS, $stackPtr - 1, null, true);
         $prevToken = $phpcsFile->getTokens()[$prevTokenPtr];
 
         if (($prevToken['code'] === T_EQUAL || $prevToken['code'] === T_RETURN || $prevToken['code'] === T_DOUBLE_ARROW) && $stackToken['code'] === T_MATCH) {
             // Use "match" construction.
             $firstTokenPtr = PhpCsUtils::findFirstTokenOnLine($phpcsFile, $stackToken['line']);
-            $prevTokenPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $firstTokenPtr - 1, null, true);
+            $prevTokenPtr = $phpcsFile->findPrevious(Tokens::EMPTY_TOKENS, $firstTokenPtr - 1, null, true);
             $prevToken = $phpcsFile->getTokens()[$prevTokenPtr];
         }
 
@@ -92,14 +92,14 @@ public function process(File $phpcsFile, mixed $stackPtr): void
 
         // Check blank lines after
         $scopeCloserPtr = $stackToken['scope_closer'];
-        $nextTokenPtr = $phpcsFile->findNext(Tokens::$emptyTokens, $scopeCloserPtr + 1, null, true);
+        $nextTokenPtr = $phpcsFile->findNext(Tokens::EMPTY_TOKENS, $scopeCloserPtr + 1, null, true);
 
         if ($nextTokenPtr) {
             $nextToken = $phpcsFile->getTokens()[$nextTokenPtr];
 
             if ($nextToken['code'] === T_SEMICOLON && $stackToken['code'] === T_MATCH) {
                 // Use "match" construction.
-                $nextTokenPtr = $phpcsFile->findNext(Tokens::$emptyTokens, $nextTokenPtr + 1, null, true);
+                $nextTokenPtr = $phpcsFile->findNext(Tokens::EMPTY_TOKENS, $nextTokenPtr + 1, null, true);
                 $nextToken = $nextTokenPtr ? $phpcsFile->getTokens()[$nextTokenPtr] : null;
             }