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
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Class_
{
if ($node->isAbstract()) {
return null;
}

if (! $node->isFinal() && FeatureFlags::treatClassesAsFinal() === false) {
return null;
}
Expand Down
4 changes: 4 additions & 0 deletions rules/CodeQuality/Rector/New_/NewStaticToNewSelfRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if ($node->isAbstract()) {
return null;
}

if (! $node->isFinal() && FeatureFlags::treatClassesAsFinal() === false) {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function refactor(Node $node): ?Class_
private function shouldSkipNonFinalNonPrivateClassMethod(Class_ $class, ClassMethod $classMethod): bool
{
if ($class->isFinal() || FeatureFlags::treatClassesAsFinal()) {
return false;
return $class->isAbstract();
}

if ($classMethod->isMagic()) {
Expand Down
2 changes: 1 addition & 1 deletion rules/Php83/Rector/ClassConst/AddTypeToConstRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ private function getParentReflections(string $className): array
private function canBeInherited(ClassConst $classConst, Class_ $class): bool
{
if (FeatureFlags::treatClassesAsFinal()) {
return false;
return $class->isAbstract();
}

return ! $class->isFinal() && ! $classConst->isPrivate() && ! $classConst->isFinal();
Expand Down