Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/Fixer/PhpUnitAssertArgumentsOrderFixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
use PhpCsFixer\FixerDefinition\CodeSample;
use PhpCsFixer\FixerDefinition\FixerDefinition;
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
use PhpCsFixer\Indicator\PhpUnitTestCaseIndicator;
use PhpCsFixer\Tokenizer\Analyzer\FunctionsAnalyzer;
use PhpCsFixer\Tokenizer\Analyzer\PhpUnitTestCaseAnalyzer;
use PhpCsFixer\Tokenizer\Token;
use PhpCsFixer\Tokenizer\Tokens;
use PhpCsFixerCustomFixers\Analyzer\Analysis\ArgumentAnalysis;
Expand Down Expand Up @@ -79,10 +79,8 @@ public function isRisky(): bool

public function fix(\SplFileInfo $file, Tokens $tokens): void
{
$phpUnitTestCaseIndicator = new PhpUnitTestCaseIndicator();

/** @var list<int> $indices */
foreach ($phpUnitTestCaseIndicator->findPhpUnitClasses($tokens) as $indices) {
foreach ((new PhpUnitTestCaseAnalyzer())->findPhpUnitClasses($tokens) as $indices) {
self::fixArgumentsOrder($tokens, $indices[0], $indices[1]);
}
}
Expand Down
6 changes: 2 additions & 4 deletions src/Fixer/PhpUnitDedicatedAssertFixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
use PhpCsFixer\FixerDefinition\CodeSample;
use PhpCsFixer\FixerDefinition\FixerDefinition;
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
use PhpCsFixer\Indicator\PhpUnitTestCaseIndicator;
use PhpCsFixer\Tokenizer\Analyzer\FunctionsAnalyzer;
use PhpCsFixer\Tokenizer\Analyzer\PhpUnitTestCaseAnalyzer;
use PhpCsFixer\Tokenizer\Token;
use PhpCsFixer\Tokenizer\Tokens;
use PhpCsFixerCustomFixers\Analyzer\Analysis\ArgumentAnalysis;
Expand Down Expand Up @@ -85,10 +85,8 @@ public function isRisky(): bool

public function fix(\SplFileInfo $file, Tokens $tokens): void
{
$phpUnitTestCaseIndicator = new PhpUnitTestCaseIndicator();

/** @var list<int> $indices */
foreach ($phpUnitTestCaseIndicator->findPhpUnitClasses($tokens) as $indices) {
foreach ((new PhpUnitTestCaseAnalyzer())->findPhpUnitClasses($tokens) as $indices) {
self::fixAssertions($tokens, $indices[0], $indices[1]);
}
}
Expand Down
6 changes: 2 additions & 4 deletions src/Fixer/PhpUnitNoUselessReturnFixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
use PhpCsFixer\FixerDefinition\CodeSample;
use PhpCsFixer\FixerDefinition\FixerDefinition;
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
use PhpCsFixer\Indicator\PhpUnitTestCaseIndicator;
use PhpCsFixer\Tokenizer\Analyzer\FunctionsAnalyzer;
use PhpCsFixer\Tokenizer\Analyzer\PhpUnitTestCaseAnalyzer;
use PhpCsFixer\Tokenizer\Tokens;
use PhpCsFixer\Utils;
use PhpCsFixerCustomFixers\TokenRemover;
Expand Down Expand Up @@ -70,10 +70,8 @@ public function isRisky(): bool

public function fix(\SplFileInfo $file, Tokens $tokens): void
{
$phpUnitTestCaseIndicator = new PhpUnitTestCaseIndicator();

/** @var list<int> $indices */
foreach ($phpUnitTestCaseIndicator->findPhpUnitClasses($tokens) as $indices) {
foreach ((new PhpUnitTestCaseAnalyzer())->findPhpUnitClasses($tokens) as $indices) {
self::removeUselessReturns($tokens, $indices[0], $indices[1]);
}
}
Expand Down
6 changes: 2 additions & 4 deletions src/Fixer/PhpUnitRequiresConstraintFixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
use PhpCsFixer\FixerDefinition\CodeSample;
use PhpCsFixer\FixerDefinition\FixerDefinition;
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
use PhpCsFixer\Indicator\PhpUnitTestCaseIndicator;
use PhpCsFixer\Preg;
use PhpCsFixer\Tokenizer\Analyzer\Analysis\NamespaceUseAnalysis;
use PhpCsFixer\Tokenizer\Analyzer\AttributeAnalyzer;
use PhpCsFixer\Tokenizer\Analyzer\FullyQualifiedNameAnalyzer;
use PhpCsFixer\Tokenizer\Analyzer\PhpUnitTestCaseAnalyzer;
use PhpCsFixer\Tokenizer\CT;
use PhpCsFixer\Tokenizer\Token;
use PhpCsFixer\Tokenizer\Tokens;
Expand Down Expand Up @@ -72,10 +72,8 @@ public function isRisky(): bool

public function fix(\SplFileInfo $file, Tokens $tokens): void
{
$phpUnitTestCaseIndicator = new PhpUnitTestCaseIndicator();

/** @var list<int> $indices */
foreach ($phpUnitTestCaseIndicator->findPhpUnitClasses($tokens) as $indices) {
foreach ((new PhpUnitTestCaseAnalyzer())->findPhpUnitClasses($tokens) as $indices) {
self::fixClass($tokens, $indices[0], $indices[1]);
}
}
Expand Down
Loading