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
4 changes: 0 additions & 4 deletions e2e/applied-auto-import/expected-output.diff
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@

Applied rules:
* RenameClassRector
* DocblockNameImportingPostRector
* NameImportingPostRector
* UnusedImportRemovingPostRector
* UseAddingPostRector


[OK] 1 file would have been changed (dry-run) by Rector
7 changes: 1 addition & 6 deletions src/ChangesReporting/ValueObjectFactory/FileDiffFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ public function createFileDiffWithLineChanges(
$consoleDiff = $shouldShowDiffs ? $this->colorConsoleDiffFormatter->format($diff) : '';

// always keep the most recent diff
return new FileDiff(
$relativeFilePath,
$diff,
$consoleDiff,
$rectorsWithLineChanges
);
return new FileDiff($relativeFilePath, $diff, $consoleDiff, $rectorsWithLineChanges);
}
}
2 changes: 1 addition & 1 deletion src/Testing/PHPUnit/ValueObject/RectorTestResult.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ public function getAppliedRectorClasses(): array
$rectorClasses = array_merge($rectorClasses, $fileDiff->getRectorClasses());
}

return RectorClassesSorter::sort($rectorClasses);
return RectorClassesSorter::sortAndFilterOutPostRectors($rectorClasses);
}
}
14 changes: 4 additions & 10 deletions src/Util/RectorClassesSorter.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,16 @@ final class RectorClassesSorter
* @param array<class-string<RectorInterface|PostRectorInterface>> $rectorClasses
* @return array<class-string<RectorInterface|PostRectorInterface>>
*/
public static function sort(array $rectorClasses): array
public static function sortAndFilterOutPostRectors(array $rectorClasses): array
{
$rectorClasses = array_unique($rectorClasses);

$mainRector = array_filter(
$mainRectorClasses = array_filter(
$rectorClasses,
fn (string $rectorClass): bool => is_a($rectorClass, RectorInterface::class, true)
);
sort($mainRector);
sort($mainRectorClasses);

$postRector = array_filter(
$rectorClasses,
fn (string $rectorClass): bool => is_a($rectorClass, PostRectorInterface::class, true)
);
sort($postRector);

return array_merge($mainRector, $postRector);
return $mainRectorClasses;
}
}
2 changes: 1 addition & 1 deletion src/ValueObject/Reporting/FileDiff.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function getRectorClasses(): array
$rectorClasses[] = $rectorWithLineChange->getRectorClass();
}

return RectorClassesSorter::sort($rectorClasses);
return RectorClassesSorter::sortAndFilterOutPostRectors($rectorClasses);
}

public function getFirstLineNumber(): ?int
Expand Down
Loading