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,11 +71,7 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Class_
{
if ($node->isAbstract()) {
return null;
}

if (! $node->isFinal() && FeatureFlags::treatClassesAsFinal() === false) {
if (! $node->isFinal() && FeatureFlags::treatClassesAsFinal($node) === false) {
return null;
}

Expand Down
6 changes: 1 addition & 5 deletions rules/CodeQuality/Rector/New_/NewStaticToNewSelfRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,7 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if ($node->isAbstract()) {
return null;
}

if (! $node->isFinal() && FeatureFlags::treatClassesAsFinal() === false) {
if (! $node->isFinal() && FeatureFlags::treatClassesAsFinal($node) === false) {
return null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function refactor(Node $node): ?Class_
continue;
}

if ($stmt->isFinal() && ! $node->isFinal() && FeatureFlags::treatClassesAsFinal() === false) {
if ($stmt->isFinal() && ! $node->isFinal() && FeatureFlags::treatClassesAsFinal($node) === false) {
continue;
}

Expand All @@ -114,8 +114,8 @@ public function refactor(Node $node): ?Class_

private function shouldSkipNonFinalNonPrivateClassMethod(Class_ $class, ClassMethod $classMethod): bool
{
if ($class->isFinal() || FeatureFlags::treatClassesAsFinal()) {
return $class->isAbstract();
if ($class->isFinal() || FeatureFlags::treatClassesAsFinal($class)) {
return false;
}

if ($classMethod->isMagic()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,8 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if ($node->isAbstract()) {
return null;
}

// may have child, or override parent that needs to follow the signature
if (! $node->isFinal() && FeatureFlags::treatClassesAsFinal() === false) {
if (! $node->isFinal() && FeatureFlags::treatClassesAsFinal($node) === false) {
return null;
}

Expand Down
4 changes: 2 additions & 2 deletions rules/Php83/Rector/ClassConst/AddTypeToConstRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ private function getParentReflections(string $className): array

private function canBeInherited(ClassConst $classConst, Class_ $class): bool
{
if (FeatureFlags::treatClassesAsFinal()) {
return $class->isAbstract();
if (FeatureFlags::treatClassesAsFinal($class)) {
return false;
}

return ! $class->isFinal() && ! $classConst->isPrivate() && ! $classConst->isFinal();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ private function isClassMethodPrivate(Class_ $class, ClassMethod $classMethod):
return true;
}

$isClassFinal = $class->isFinal() || (FeatureFlags::treatClassesAsFinal() && ! $class->isAbstract());
$isClassFinal = $class->isFinal() || FeatureFlags::treatClassesAsFinal($class);

return $isClassFinal && ! $class->extends instanceof Name && $class->implements === [] && $classMethod->isProtected();
}
Expand Down
9 changes: 8 additions & 1 deletion src/Configuration/Parameter/FeatureFlags.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Rector\Configuration\Parameter;

use PhpParser\Node\Stmt\Class_;
use Rector\Configuration\Option;

/**
Expand All @@ -12,8 +13,14 @@
*/
final class FeatureFlags
{
public static function treatClassesAsFinal(): bool
public static function treatClassesAsFinal(Class_ $class): bool
{
// abstract class never can be treated as "final"
// as always must be overridden
if ($class->isAbstract()) {
return false;
}

return SimpleParameterProvider::provideBoolParameter(Option::TREAT_CLASSES_AS_FINAL);
}
}
Loading