diff --git a/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php b/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php index d6882ad..6ac312f 100644 --- a/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php +++ b/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php @@ -88,7 +88,8 @@ public function process(File $phpcsFile, $stackPtr): void $skip = Tokens::$emptyTokens + [T_COMMA => T_COMMA]; - while ($classPtr = $phpcsFile->findPrevious($skip, $to - 1, $from + 1, true)) { + $classPtr = $phpcsFile->findPrevious($skip, $to - 1, $from + 1, true); + while ($classPtr) { $to = $phpcsFile->findPrevious(T_COMMA, $classPtr - 1, $from + 1); if (!$this->isClassUsed($phpcsFile, $stackPtr, $classPtr)) { @@ -120,6 +121,8 @@ public function process(File $phpcsFile, $stackPtr): void if (false === $to) { break; } + + $classPtr = $phpcsFile->findPrevious($skip, $to - 1, $from + 1, true); } return; @@ -166,7 +169,9 @@ public function process(File $phpcsFile, $stackPtr): void if (T_SEMICOLON === $tokens[$semiColon]['code']) { break; } - } while ($semiColon = $phpcsFile->findEndOfStatement($semiColon + 1)); + + $semiColon = $phpcsFile->findEndOfStatement($semiColon + 1); + } while ($semiColon); } /** diff --git a/SymfonyCustom/ruleset.xml b/SymfonyCustom/ruleset.xml index 87d86cc..84fe6b3 100755 --- a/SymfonyCustom/ruleset.xml +++ b/SymfonyCustom/ruleset.xml @@ -69,6 +69,7 @@ + @@ -78,7 +79,6 @@ - diff --git a/TwigCS/Token/TokenParser.php b/TwigCS/Token/TokenParser.php index 52cce2b..8de3cc6 100644 --- a/TwigCS/Token/TokenParser.php +++ b/TwigCS/Token/TokenParser.php @@ -84,7 +84,8 @@ public function getTag(): string private function hasBody(TokenStream $stream): bool { $look = 0; - while ($token = $stream->look($look)) { + $token = $stream->look($look); + while ($token) { if ($token->getType() === Token::EOF_TYPE) { return false; } @@ -96,6 +97,7 @@ private function hasBody(TokenStream $stream): bool } $look++; + $token = $stream->look($look); } return false;