From eda978a1922a1d37f6dc65cb65c56d6e27c1d1e9 Mon Sep 17 00:00:00 2001 From: Kate Syrotchuk Date: Tue, 6 Jan 2026 11:01:54 +0100 Subject: [PATCH 1/5] fix sniff after update escapestudios/symfony2-coding-standard --- src/PhpCs/FiveLab/PhpCsUtils.php | 6 +++--- .../FiveLab/Sniffs/AbstractFunctionCallSniff.php | 6 +++--- .../FiveLab/Sniffs/Formatting/MultiLineSniff.php | 2 +- .../Formatting/SemicolonSingleCharSniff.php | 2 +- .../FiveLab/Sniffs/Formatting/ThrowSniff.php | 4 ++-- .../Sniffs/Formatting/UnusedImportsSniff.php | 3 +++ .../WhiteSpaceAroundControlStatementSniff.php | 8 ++++---- .../WhiteSpaceAroundMultilineArraySniff.php | 6 +++--- .../WhiteSpaceAroundMultilineCallSniff.php | 6 +++--- .../WhiteSpaceAroundParentCallSniff.php | 4 ++-- .../WhiteSpaceBeforeChainCallSniff.php | 2 +- ...iffTestCase.php => AbstractSniffTestCase.php} | 2 +- .../Attributes/ProhibitedAttributeSniffTest.php | 4 ++-- .../Sniffs/Commenting/AnnotationsSniffTest.php | 4 ++-- .../Commenting/ClassPropertyDocSniffTest.php | 4 ++-- .../Sniffs/Commenting/CommentSniffTest.php | 4 ++-- .../Sniffs/Commenting/InheritdocSniffTest.php | 4 ++-- .../Sniffs/Commenting/MagicMethodSniffTest.php | 4 ++-- .../ProhibitedDocCommentsSniffTest.php | 4 ++-- .../ProhibitedInheritdocOnlySniffTest.php | 4 ++-- .../WhiteSpaceAfterCommentStartSniffTest.php | 4 ++-- .../Sniffs/Formatting/DeclareSniffTest.php | 4 ++-- .../Sniffs/Formatting/ManySpacesSniffTest.php | 4 ++-- .../Sniffs/Formatting/MissedSpacesSniffTest.php | 4 ++-- .../Formatting/MultiLineArgumentsSniffTest.php | 16 ++++++---------- .../Sniffs/Formatting/MultiLineSniffTest.php | 4 ++-- .../Sniffs/Formatting/ReadonlySniffTest.php | 4 ++-- .../Formatting/SemicolonSingleCharSniffTest.php | 4 ++-- .../FiveLab/Sniffs/Formatting/ThrowSniffTest.php | 4 ++-- .../Formatting/TypedConstantsSniffTest.php | 16 ++++++---------- .../Sniffs/Formatting/TypehintSniffTest.php | 4 ++-- .../Sniffs/Formatting/UnusedImportsSniffTest.php | 4 ++-- .../WhiteSpaceAfterOpenerSniffTest.php | 4 ++-- .../WhiteSpaceAroundClassPropertySniffTest.php | 4 ++-- ...WhiteSpaceAroundControlStatementSniffTest.php | 4 ++-- .../WhiteSpaceAroundMultilineArraySniffTest.php | 4 ++-- .../WhiteSpaceAroundMultilineCallSniffTest.php | 4 ++-- .../WhiteSpaceAroundParentCallSniffTest.php | 4 ++-- .../WhiteSpaceBeforeChainCallSniffTest.php | 4 ++-- .../Functions/GlobalFunctionsSniffTest.php | 4 ++-- .../Sniffs/Namespace/NamespaceSniffTest.php | 4 ++-- .../FiveLab/Sniffs/Strings/AsciiSniffTest.php | 4 ++-- .../FiveLab/Sniffs/Strings/StringSniffTest.php | 4 ++-- .../Whitespace/ManyWhitespacesSniffTest.php | 4 ++-- .../ForbiddenPassArgumentAsReferenceRuleTest.php | 9 +++------ 45 files changed, 102 insertions(+), 110 deletions(-) rename tests/PhpCs/FiveLab/Sniffs/{SniffTestCase.php => AbstractSniffTestCase.php} (98%) diff --git a/src/PhpCs/FiveLab/PhpCsUtils.php b/src/PhpCs/FiveLab/PhpCsUtils.php index 6e8c3d0..91f6b9d 100644 --- a/src/PhpCs/FiveLab/PhpCsUtils.php +++ b/src/PhpCs/FiveLab/PhpCsUtils.php @@ -61,7 +61,7 @@ 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) { @@ -69,7 +69,7 @@ public static function getDiffLines(File $file, int $fromPtr, int $toPtr): int $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); diff --git a/src/PhpCs/FiveLab/Sniffs/AbstractFunctionCallSniff.php b/src/PhpCs/FiveLab/Sniffs/AbstractFunctionCallSniff.php index 1a2ec0c..1067a36 100644 --- a/src/PhpCs/FiveLab/Sniffs/AbstractFunctionCallSniff.php +++ b/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; diff --git a/src/PhpCs/FiveLab/Sniffs/Formatting/MultiLineSniff.php b/src/PhpCs/FiveLab/Sniffs/Formatting/MultiLineSniff.php index 6ab338a..3395358 100644 --- a/src/PhpCs/FiveLab/Sniffs/Formatting/MultiLineSniff.php +++ b/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); diff --git a/src/PhpCs/FiveLab/Sniffs/Formatting/SemicolonSingleCharSniff.php b/src/PhpCs/FiveLab/Sniffs/Formatting/SemicolonSingleCharSniff.php index 94d8138..559e22c 100644 --- a/src/PhpCs/FiveLab/Sniffs/Formatting/SemicolonSingleCharSniff.php +++ b/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( diff --git a/src/PhpCs/FiveLab/Sniffs/Formatting/ThrowSniff.php b/src/PhpCs/FiveLab/Sniffs/Formatting/ThrowSniff.php index 5afa4fd..8fb0260 100644 --- a/src/PhpCs/FiveLab/Sniffs/Formatting/ThrowSniff.php +++ b/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(); diff --git a/src/PhpCs/FiveLab/Sniffs/Formatting/UnusedImportsSniff.php b/src/PhpCs/FiveLab/Sniffs/Formatting/UnusedImportsSniff.php index b891fae..d70c933 100644 --- a/src/PhpCs/FiveLab/Sniffs/Formatting/UnusedImportsSniff.php +++ b/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)) { diff --git a/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundControlStatementSniff.php b/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundControlStatementSniff.php index 45d5df1..6b7f73e 100644 --- a/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundControlStatementSniff.php +++ b/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; } diff --git a/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineArraySniff.php b/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineArraySniff.php index 98e0da0..074147e 100644 --- a/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineArraySniff.php +++ b/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineArraySniff.php @@ -35,7 +35,7 @@ public function process(File $phpcsFile, mixed $stackPtr): void { $tokens = $phpcsFile->getTokens(); - $semicolonPtr = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true); + $semicolonPtr = $phpcsFile->findNext(Tokens::EMPTY_TOKENS, $stackPtr + 1, null, true); if (!$semicolonPtr || $tokens[$semicolonPtr]['code'] !== T_SEMICOLON) { // Not close root array. Skip. @@ -55,7 +55,7 @@ public function process(File $phpcsFile, mixed $stackPtr): void // Check before. $firstTokenOnOpenerLinePtr = PhpCsUtils::findFirstTokenOnLine($phpcsFile, $tokens[$openerTokenPtr]['line']); - $prevTokenPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $firstTokenOnOpenerLinePtr - 1, null, true); + $prevTokenPtr = $phpcsFile->findPrevious(Tokens::EMPTY_TOKENS, $firstTokenOnOpenerLinePtr - 1, null, true); $prevToken = $tokens[$prevTokenPtr]; $diffLinesBefore = PhpCsUtils::getDiffLines($phpcsFile, (int) $prevTokenPtr, (int) $firstTokenOnOpenerLinePtr); @@ -70,7 +70,7 @@ public function process(File $phpcsFile, mixed $stackPtr): void } // Check after - $nextTokenPtr = $phpcsFile->findNext(Tokens::$emptyTokens, $semicolonPtr + 1, null, true); + $nextTokenPtr = $phpcsFile->findNext(Tokens::EMPTY_TOKENS, $semicolonPtr + 1, null, true); if ($nextTokenPtr) { $nextToken = $tokens[$nextTokenPtr]; diff --git a/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineCallSniff.php b/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineCallSniff.php index 7a22bb0..36db55e 100644 --- a/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineCallSniff.php +++ b/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineCallSniff.php @@ -51,7 +51,7 @@ protected function processFunctionCall(File $phpcsFile, int $stackPtr, array $pa private function checkBeforeCall(File $phpcsFile, int $stackPtr): void { $tokens = $phpcsFile->getTokens(); - $prevTokenPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $stackPtr - 1, null, true); + $prevTokenPtr = $phpcsFile->findPrevious(Tokens::EMPTY_TOKENS, $stackPtr - 1, null, true); $possiblePrevTokens = [T_DOUBLE_COLON, T_COMMA]; @@ -62,14 +62,14 @@ private function checkBeforeCall(File $phpcsFile, int $stackPtr): void // Find any token on prev line. $firstTokenPtrOnLine = PhpCsUtils::findFirstTokenOnLine($phpcsFile, $tokens[$stackPtr]['line']); - $prevTokenPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $firstTokenPtrOnLine - 1, null, true); + $prevTokenPtr = $phpcsFile->findPrevious(Tokens::EMPTY_TOKENS, $firstTokenPtrOnLine - 1, null, true); if (false !== $prevTokenPtr) { $prevToken = $tokens[$prevTokenPtr]; if ($prevToken['code'] === T_VARIABLE) { // Call method on next line (multiline chain call). - $prevTokenPtr = (int) $phpcsFile->findPrevious(Tokens::$emptyTokens, $prevTokenPtr - 1, null, true); + $prevTokenPtr = (int) $phpcsFile->findPrevious(Tokens::EMPTY_TOKENS, $prevTokenPtr - 1, null, true); $prevToken = $tokens[$prevTokenPtr]; } diff --git a/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundParentCallSniff.php b/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundParentCallSniff.php index 1722fcf..8786c5c 100644 --- a/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundParentCallSniff.php +++ b/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundParentCallSniff.php @@ -49,7 +49,7 @@ private function processAfter(File $phpcsFile, int $stackPtr): void $semicolonPtr = $phpcsFile->findNext([T_SEMICOLON], $stackPtr + 1); - $nextTokenPtr = $phpcsFile->findNext(Tokens::$emptyTokens, $semicolonPtr + 1, null, true); + $nextTokenPtr = $phpcsFile->findNext(Tokens::EMPTY_TOKENS, $semicolonPtr + 1, null, true); if ($tokens[$nextTokenPtr]['code'] === T_CLOSE_CURLY_BRACKET) { // End statement. Normal. @@ -79,7 +79,7 @@ private function processBefore(File $phpcsFile, int $stackPtr): void $token = $tokens[$stackPtr]; $firstTokenOnLine = PhpCsUtils::findFirstTokenOnLine($phpcsFile, $token['line']); - $prevTokenPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, (int) $firstTokenOnLine, null, true); + $prevTokenPtr = $phpcsFile->findPrevious(Tokens::EMPTY_TOKENS, (int) $firstTokenOnLine, null, true); if ($tokens[$prevTokenPtr]['code'] === T_OPEN_CURLY_BRACKET) { // Start statement. Normal. diff --git a/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceBeforeChainCallSniff.php b/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceBeforeChainCallSniff.php index b46cc97..3a6b361 100644 --- a/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceBeforeChainCallSniff.php +++ b/src/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceBeforeChainCallSniff.php @@ -133,7 +133,7 @@ private function getNonEmptyTokensOnLine(File $phpcsFile, int $line): array $tokens = PhpCsUtils::getTokensOnLine($phpcsFile, $line); $tokens = \array_filter($tokens, static function (array $token): bool { - return !\in_array($token['code'], Tokens::$emptyTokens, true); + return !\in_array($token['code'], Tokens::EMPTY_TOKENS, true); }); return \array_values($tokens); diff --git a/tests/PhpCs/FiveLab/Sniffs/SniffTestCase.php b/tests/PhpCs/FiveLab/Sniffs/AbstractSniffTestCase.php similarity index 98% rename from tests/PhpCs/FiveLab/Sniffs/SniffTestCase.php rename to tests/PhpCs/FiveLab/Sniffs/AbstractSniffTestCase.php index 89b910d..a8cdb18 100644 --- a/tests/PhpCs/FiveLab/Sniffs/SniffTestCase.php +++ b/tests/PhpCs/FiveLab/Sniffs/AbstractSniffTestCase.php @@ -21,7 +21,7 @@ use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; -abstract class SniffTestCase extends TestCase +abstract class AbstractSniffTestCase extends TestCase { protected Config $config; protected Ruleset $ruleset; diff --git a/tests/PhpCs/FiveLab/Sniffs/Attributes/ProhibitedAttributeSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Attributes/ProhibitedAttributeSniffTest.php index 432b056..144f3a3 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Attributes/ProhibitedAttributeSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Attributes/ProhibitedAttributeSniffTest.php @@ -14,11 +14,11 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Attributes; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Attributes\ProhibitedAttributeSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; -class ProhibitedAttributeSniffTest extends SniffTestCase +class ProhibitedAttributeSniffTest extends AbstractSniffTestCase { #[Test] #[DataProvider('provideDataSet')] diff --git a/tests/PhpCs/FiveLab/Sniffs/Commenting/AnnotationsSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Commenting/AnnotationsSniffTest.php index ee4babb..1a0d7ac 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Commenting/AnnotationsSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Commenting/AnnotationsSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Commenting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Commenting\AnnotationsSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class AnnotationsSniffTest extends SniffTestCase +class AnnotationsSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Commenting/ClassPropertyDocSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Commenting/ClassPropertyDocSniffTest.php index 9a81356..2a7441f 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Commenting/ClassPropertyDocSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Commenting/ClassPropertyDocSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Commenting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Commenting\ClassPropertyDocSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class ClassPropertyDocSniffTest extends SniffTestCase +class ClassPropertyDocSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Commenting/CommentSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Commenting/CommentSniffTest.php index cee797d..c10feb5 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Commenting/CommentSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Commenting/CommentSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Commenting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Commenting\CommentSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class CommentSniffTest extends SniffTestCase +class CommentSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Commenting/InheritdocSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Commenting/InheritdocSniffTest.php index 1cacc17..0e5992d 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Commenting/InheritdocSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Commenting/InheritdocSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Commenting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Commenting\InheritdocSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class InheritdocSniffTest extends SniffTestCase +class InheritdocSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Commenting/MagicMethodSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Commenting/MagicMethodSniffTest.php index b49f8ba..acbd42f 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Commenting/MagicMethodSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Commenting/MagicMethodSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Commenting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Commenting\MagicMethodSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class MagicMethodSniffTest extends SniffTestCase +class MagicMethodSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Commenting/ProhibitedDocCommentsSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Commenting/ProhibitedDocCommentsSniffTest.php index 9094771..ca746bd 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Commenting/ProhibitedDocCommentsSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Commenting/ProhibitedDocCommentsSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Commenting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Commenting\ProhibitedDocCommentsSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class ProhibitedDocCommentsSniffTest extends SniffTestCase +class ProhibitedDocCommentsSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Commenting/ProhibitedInheritdocOnlySniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Commenting/ProhibitedInheritdocOnlySniffTest.php index 7c073e6..9658267 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Commenting/ProhibitedInheritdocOnlySniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Commenting/ProhibitedInheritdocOnlySniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Commenting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Commenting\ProhibitedInheritdocOnlySniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class ProhibitedInheritdocOnlySniffTest extends SniffTestCase +class ProhibitedInheritdocOnlySniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Commenting/WhiteSpaceAfterCommentStartSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Commenting/WhiteSpaceAfterCommentStartSniffTest.php index fe39f9c..6a7c9a8 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Commenting/WhiteSpaceAfterCommentStartSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Commenting/WhiteSpaceAfterCommentStartSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Commenting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Commenting\WhiteSpaceAfterCommentStartSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class WhiteSpaceAfterCommentStartSniffTest extends SniffTestCase +class WhiteSpaceAfterCommentStartSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/DeclareSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/DeclareSniffTest.php index dbb470a..8f250ba 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/DeclareSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/DeclareSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\DeclareSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class DeclareSniffTest extends SniffTestCase +class DeclareSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/ManySpacesSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/ManySpacesSniffTest.php index 7ae4887..0e44f95 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/ManySpacesSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/ManySpacesSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\ManySpacesSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class ManySpacesSniffTest extends SniffTestCase +class ManySpacesSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/MissedSpacesSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/MissedSpacesSniffTest.php index 3a218b6..691c41b 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/MissedSpacesSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/MissedSpacesSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\MissedSpacesSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class MissedSpacesSniffTest extends SniffTestCase +class MissedSpacesSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/MultiLineArgumentsSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/MultiLineArgumentsSniffTest.php index 9f2ae71..c272351 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/MultiLineArgumentsSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/MultiLineArgumentsSniffTest.php @@ -14,18 +14,14 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\MultiLineArgumentsSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Test; -class MultiLineArgumentsSniffTest extends SniffTestCase +class MultiLineArgumentsSniffTest extends AbstractSniffTestCase { - /** - * @test - * - * @param string $file - * @param array ...$expectedErrors - * - * @dataProvider provideDataSet - */ + #[Test] + #[DataProvider('provideDataSet')] public function shouldSuccessProcessFile(string $file, array ...$expectedErrors): void { $onlyInOneLine = (int) \substr($file, -5, 1); diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/MultiLineSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/MultiLineSniffTest.php index 98d2194..5e067ff 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/MultiLineSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/MultiLineSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\MultiLineSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class MultiLineSniffTest extends SniffTestCase +class MultiLineSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/ReadonlySniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/ReadonlySniffTest.php index e5c42db..e5c3882 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/ReadonlySniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/ReadonlySniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\ReadonlySniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class ReadonlySniffTest extends SniffTestCase +class ReadonlySniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/SemicolonSingleCharSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/SemicolonSingleCharSniffTest.php index da974b4..4c77983 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/SemicolonSingleCharSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/SemicolonSingleCharSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\SemicolonSingleCharSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class SemicolonSingleCharSniffTest extends SniffTestCase +class SemicolonSingleCharSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/ThrowSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/ThrowSniffTest.php index a5cd9fb..7035080 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/ThrowSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/ThrowSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\ThrowSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class ThrowSniffTest extends SniffTestCase +class ThrowSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/TypedConstantsSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/TypedConstantsSniffTest.php index 001c4fe..52d7345 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/TypedConstantsSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/TypedConstantsSniffTest.php @@ -14,23 +14,19 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\TypedConstantsSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Test; -class TypedConstantsSniffTest extends SniffTestCase +class TypedConstantsSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { return TypedConstantsSniff::class; } - /** - * @test - * - * @param string $file - * @param array ...$expectedErrors - * - * @dataProvider provideDataSet - */ + #[Test] + #[DataProvider('provideDataSet')] public function shouldSuccessProcessFile(string $file, array ...$expectedErrors): void { if (PHP_VERSION_ID < 80300) { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/TypehintSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/TypehintSniffTest.php index b64264d..6a118f8 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/TypehintSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/TypehintSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\TypehintSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class TypehintSniffTest extends SniffTestCase +class TypehintSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/UnusedImportsSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/UnusedImportsSniffTest.php index 19a5f85..1b20d84 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/UnusedImportsSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/UnusedImportsSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\UnusedImportsSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class UnusedImportsSniffTest extends SniffTestCase +class UnusedImportsSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAfterOpenerSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAfterOpenerSniffTest.php index ea2eca9..a839f4b 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAfterOpenerSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAfterOpenerSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\WhiteSpaceAfterOpenerSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class WhiteSpaceAfterOpenerSniffTest extends SniffTestCase +class WhiteSpaceAfterOpenerSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundClassPropertySniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundClassPropertySniffTest.php index 629704c..e4b275d 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundClassPropertySniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundClassPropertySniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\WhiteSpaceAroundClassPropertySniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class WhiteSpaceAroundClassPropertySniffTest extends SniffTestCase +class WhiteSpaceAroundClassPropertySniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundControlStatementSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundControlStatementSniffTest.php index 3528807..55616a4 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundControlStatementSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundControlStatementSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\WhiteSpaceAroundControlStatementSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class WhiteSpaceAroundControlStatementSniffTest extends SniffTestCase +class WhiteSpaceAroundControlStatementSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineArraySniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineArraySniffTest.php index 1ac4028..30681c5 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineArraySniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineArraySniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\WhiteSpaceAroundMultilineArraySniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class WhiteSpaceAroundMultilineArraySniffTest extends SniffTestCase +class WhiteSpaceAroundMultilineArraySniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineCallSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineCallSniffTest.php index 5fb2f9e..4dd03cb 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineCallSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundMultilineCallSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\WhiteSpaceAroundMultilineCallSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class WhiteSpaceAroundMultilineCallSniffTest extends SniffTestCase +class WhiteSpaceAroundMultilineCallSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundParentCallSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundParentCallSniffTest.php index 62f5f53..e3c7979 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundParentCallSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceAroundParentCallSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\WhiteSpaceAroundParentCallSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class WhiteSpaceAroundParentCallSniffTest extends SniffTestCase +class WhiteSpaceAroundParentCallSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceBeforeChainCallSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceBeforeChainCallSniffTest.php index aae1259..6503f34 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceBeforeChainCallSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Formatting/WhiteSpaceBeforeChainCallSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Formatting; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Formatting\WhiteSpaceBeforeChainCallSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class WhiteSpaceBeforeChainCallSniffTest extends SniffTestCase +class WhiteSpaceBeforeChainCallSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Functions/GlobalFunctionsSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Functions/GlobalFunctionsSniffTest.php index d77cccd..3b3ccb4 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Functions/GlobalFunctionsSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Functions/GlobalFunctionsSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Functions; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Functions\GlobalFunctionsSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class GlobalFunctionsSniffTest extends SniffTestCase +class GlobalFunctionsSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Namespace/NamespaceSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Namespace/NamespaceSniffTest.php index f918f7d..f790350 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Namespace/NamespaceSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Namespace/NamespaceSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Namespace; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Namespace\NamespaceSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class NamespaceSniffTest extends SniffTestCase +class NamespaceSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Strings/AsciiSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Strings/AsciiSniffTest.php index 0e52136..ade89f0 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Strings/AsciiSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Strings/AsciiSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Strings; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Strings\AsciiSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class AsciiSniffTest extends SniffTestCase +class AsciiSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Strings/StringSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Strings/StringSniffTest.php index bad9a2d..3c81979 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Strings/StringSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Strings/StringSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Strings; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Strings\StringSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class StringSniffTest extends SniffTestCase +class StringSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpCs/FiveLab/Sniffs/Whitespace/ManyWhitespacesSniffTest.php b/tests/PhpCs/FiveLab/Sniffs/Whitespace/ManyWhitespacesSniffTest.php index 6196a97..d07b896 100644 --- a/tests/PhpCs/FiveLab/Sniffs/Whitespace/ManyWhitespacesSniffTest.php +++ b/tests/PhpCs/FiveLab/Sniffs/Whitespace/ManyWhitespacesSniffTest.php @@ -14,9 +14,9 @@ namespace FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\Whitespace; use FiveLab\Component\CiRules\PhpCs\FiveLab\Sniffs\Whitespace\ManyWhitespacesSniff; -use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\SniffTestCase; +use FiveLab\Component\CiRules\Tests\PhpCs\FiveLab\Sniffs\AbstractSniffTestCase; -class ManyWhitespacesSniffTest extends SniffTestCase +class ManyWhitespacesSniffTest extends AbstractSniffTestCase { protected function getSniffClass(): string { diff --git a/tests/PhpStan/ForbiddenPassArgumentAsReferenceRuleTest.php b/tests/PhpStan/ForbiddenPassArgumentAsReferenceRuleTest.php index e8a0bdd..72547cc 100644 --- a/tests/PhpStan/ForbiddenPassArgumentAsReferenceRuleTest.php +++ b/tests/PhpStan/ForbiddenPassArgumentAsReferenceRuleTest.php @@ -17,6 +17,7 @@ use PhpParser\Node\Stmt\ClassMethod; use PhpParser\Node\Stmt\Function_; use PHPStan\Testing\RuleTestCase; +use PHPUnit\Framework\Attributes\Test; class ForbiddenPassArgumentAsReferenceRuleTest extends RuleTestCase { @@ -27,9 +28,7 @@ protected function getRule(): ForbiddenPassArgumentAsReferenceRule return $this->rule; } - /** - * @test - */ + #[Test] public function shouldSuccessProcessForFunction(): void { $this->rule = new ForbiddenPassArgumentAsReferenceRule(Function_::class); @@ -42,9 +41,7 @@ public function shouldSuccessProcessForFunction(): void ); } - /** - * @test - */ + #[Test] public function shouldSuccessProcessForMethod(): void { $this->rule = new ForbiddenPassArgumentAsReferenceRule(ClassMethod::class); From 10dc3ec34e81d01394188bbc1a320537475cf00a Mon Sep 17 00:00:00 2001 From: Kate Syrotchuk Date: Wed, 7 Jan 2026 10:54:27 +0100 Subject: [PATCH 2/5] udpate php to 8.4; escapestudios/symfony2-coding-standard < 3.17.0 is conflicted --- Dockerfile | 2 +- composer.json | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 11f86e5..1093d1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-cli +FROM php:8.4-cli LABEL org.opencontainers.image.authors="Vitalii Zhuk " diff --git a/composer.json b/composer.json index 78f613a..ee1c105 100644 --- a/composer.json +++ b/composer.json @@ -18,13 +18,17 @@ ], "require": { - "php": "~8.2" + "php": "~8.4.0" + }, + + "conflict": { + "escapestudios/symfony2-coding-standard": "<3.17.0" }, "require-dev": { "phpunit/phpunit": "~11.0", "phpstan/phpstan": "~2.0", - "escapestudios/symfony2-coding-standard": "~3.13" + "escapestudios/symfony2-coding-standard": "~3.17" }, "suggest": { From 2e882b7ebf0db29afc0c88aea286024f874a1f0a Mon Sep 17 00:00:00 2001 From: Kate Syrotchuk Date: Wed, 7 Jan 2026 12:56:59 +0100 Subject: [PATCH 3/5] udpate php to 8.4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ee1c105..c24bf05 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { - "php": "~8.4.0" + "php": "~8.4" }, "conflict": { From 5722aad7b54afb9fd9b0859200bc65dddd4aaeb5 Mon Sep 17 00:00:00 2001 From: Kate Syrotchuk Date: Wed, 7 Jan 2026 13:01:17 +0100 Subject: [PATCH 4/5] udpate php to 8.4 --- .github/workflows/tests.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index dd881a1..afb9906 100644 --- a/.github/workflows/tests.yaml +++ b/.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 From 72dba7b4b06742b6a3aa15dff53f3bf04a7a1505 Mon Sep 17 00:00:00 2001 From: Kate Syrotchuk Date: Wed, 7 Jan 2026 13:11:22 +0100 Subject: [PATCH 5/5] udpate conflict for squizlabs/php_codesniffer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c24bf05..03accbf 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "conflict": { - "escapestudios/symfony2-coding-standard": "<3.17.0" + "squizlabs/php_codesniffer": "<4" }, "require-dev": {