diff --git a/e2e/applied-auto-import/expected-output.diff b/e2e/applied-auto-import/expected-output.diff index 5ab0dad5769..fa67573289c 100644 --- a/e2e/applied-auto-import/expected-output.diff +++ b/e2e/applied-auto-import/expected-output.diff @@ -23,10 +23,6 @@ Applied rules: * RenameClassRector - * DocblockNameImportingPostRector - * NameImportingPostRector - * UnusedImportRemovingPostRector - * UseAddingPostRector [OK] 1 file would have been changed (dry-run) by Rector diff --git a/src/ChangesReporting/ValueObjectFactory/FileDiffFactory.php b/src/ChangesReporting/ValueObjectFactory/FileDiffFactory.php index c816c615cec..0a01e41aaae 100644 --- a/src/ChangesReporting/ValueObjectFactory/FileDiffFactory.php +++ b/src/ChangesReporting/ValueObjectFactory/FileDiffFactory.php @@ -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); } } diff --git a/src/Testing/PHPUnit/ValueObject/RectorTestResult.php b/src/Testing/PHPUnit/ValueObject/RectorTestResult.php index d831f22be64..4806fed0fa9 100644 --- a/src/Testing/PHPUnit/ValueObject/RectorTestResult.php +++ b/src/Testing/PHPUnit/ValueObject/RectorTestResult.php @@ -36,6 +36,6 @@ public function getAppliedRectorClasses(): array $rectorClasses = array_merge($rectorClasses, $fileDiff->getRectorClasses()); } - return RectorClassesSorter::sort($rectorClasses); + return RectorClassesSorter::sortAndFilterOutPostRectors($rectorClasses); } } diff --git a/src/Util/RectorClassesSorter.php b/src/Util/RectorClassesSorter.php index 6a1777eb47e..2c995360f8c 100644 --- a/src/Util/RectorClassesSorter.php +++ b/src/Util/RectorClassesSorter.php @@ -16,22 +16,16 @@ final class RectorClassesSorter * @param array> $rectorClasses * @return array> */ - 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; } } diff --git a/src/ValueObject/Reporting/FileDiff.php b/src/ValueObject/Reporting/FileDiff.php index 2b6928a86d6..9e7dd439a57 100644 --- a/src/ValueObject/Reporting/FileDiff.php +++ b/src/ValueObject/Reporting/FileDiff.php @@ -93,7 +93,7 @@ public function getRectorClasses(): array $rectorClasses[] = $rectorWithLineChange->getRectorClass(); } - return RectorClassesSorter::sort($rectorClasses); + return RectorClassesSorter::sortAndFilterOutPostRectors($rectorClasses); } public function getFirstLineNumber(): ?int