Skip to content

Commit 82aeb38

Browse files
committed
revert adding post rectors to applied rules as not relevant in result
1 parent 20db305 commit 82aeb38

File tree

5 files changed

+7
-22
lines changed

5 files changed

+7
-22
lines changed

e2e/applied-auto-import/expected-output.diff

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323

2424
Applied rules:
2525
* RenameClassRector
26-
* DocblockNameImportingPostRector
27-
* NameImportingPostRector
28-
* UnusedImportRemovingPostRector
29-
* UseAddingPostRector
3026

3127

3228
[OK] 1 file would have been changed (dry-run) by Rector

src/ChangesReporting/ValueObjectFactory/FileDiffFactory.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ public function createFileDiffWithLineChanges(
3636
$consoleDiff = $shouldShowDiffs ? $this->colorConsoleDiffFormatter->format($diff) : '';
3737

3838
// always keep the most recent diff
39-
return new FileDiff(
40-
$relativeFilePath,
41-
$diff,
42-
$consoleDiff,
43-
$rectorsWithLineChanges
44-
);
39+
return new FileDiff($relativeFilePath, $diff, $consoleDiff, $rectorsWithLineChanges);
4540
}
4641
}

src/Testing/PHPUnit/ValueObject/RectorTestResult.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ public function getAppliedRectorClasses(): array
3636
$rectorClasses = array_merge($rectorClasses, $fileDiff->getRectorClasses());
3737
}
3838

39-
return RectorClassesSorter::sort($rectorClasses);
39+
return RectorClassesSorter::sortAndFilterOutPostRectors($rectorClasses);
4040
}
4141
}

src/Util/RectorClassesSorter.php

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,16 @@ final class RectorClassesSorter
1616
* @param array<class-string<RectorInterface|PostRectorInterface>> $rectorClasses
1717
* @return array<class-string<RectorInterface|PostRectorInterface>>
1818
*/
19-
public static function sort(array $rectorClasses): array
19+
public static function sortAndFilterOutPostRectors(array $rectorClasses): array
2020
{
2121
$rectorClasses = array_unique($rectorClasses);
2222

23-
$mainRector = array_filter(
23+
$mainRectorClasses = array_filter(
2424
$rectorClasses,
2525
fn (string $rectorClass): bool => is_a($rectorClass, RectorInterface::class, true)
2626
);
27-
sort($mainRector);
27+
sort($mainRectorClasses);
2828

29-
$postRector = array_filter(
30-
$rectorClasses,
31-
fn (string $rectorClass): bool => is_a($rectorClass, PostRectorInterface::class, true)
32-
);
33-
sort($postRector);
34-
35-
return array_merge($mainRector, $postRector);
29+
return $mainRectorClasses;
3630
}
3731
}

src/ValueObject/Reporting/FileDiff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function getRectorClasses(): array
9393
$rectorClasses[] = $rectorWithLineChange->getRectorClass();
9494
}
9595

96-
return RectorClassesSorter::sort($rectorClasses);
96+
return RectorClassesSorter::sortAndFilterOutPostRectors($rectorClasses);
9797
}
9898

9999
public function getFirstLineNumber(): ?int

0 commit comments

Comments
 (0)