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
@@ -0,0 +1,20 @@
<?php

declare(strict_types=1);

namespace Rector\Symfony\Tests\CodeQuality\Rector\Class_\ControllerMethodInjectionToConstructorRector\Fixture;

use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Routing\Annotation\Route;

abstract class SkipAbstractClass extends AbstractController
{
#[Route('/some-action', name: 'some_action')]
public function someAction(LoggerInterface $logger)
{
$someClosure = function () use ($logger) {
$logger->log('level', 'value');
};
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

declare(strict_types=1);

namespace Rector\Symfony\Tests\CodeQuality\Rector\Class_\ControllerMethodInjectionToConstructorRector\Fixture;

use Psr\Log\LoggerInterface;
use Rector\Symfony\Tests\CodeQuality\Rector\Class_\ControllerMethodInjectionToConstructorRector\Source\IntermediateController;
use Symfony\Component\Routing\Annotation\Route;

final class SkipParentMethodExists extends IntermediateController
{
public function __construct()
{
}

#[Route('/some-action', name: 'some_action')]
public function someAction(LoggerInterface $logger)
{
$someClosure = function () use ($logger) {
$logger->log('level', 'value');
};
}
}

?>
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

declare(strict_types=1);

namespace Rector\Symfony\Tests\CodeQuality\Rector\Class_\ControllerMethodInjectionToConstructorRector\Source;

use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Psr\Log\LoggerInterface;
use Symfony\Component\Routing\Annotation\Route;

class IntermediateController extends AbstractController
{
#[Route('/some-action', name: 'some_action')]
public function someAction(LoggerInterface $logger)
{
// to be overridden
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
use Rector\Symfony\Enum\SymfonyClass;
use Rector\Symfony\TypeAnalyzer\ControllerAnalyzer;
use Rector\ValueObject\MethodName;
use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;

Expand All @@ -45,6 +46,7 @@ public function __construct(
private readonly StaticTypeMapper $staticTypeMapper,
private readonly AttributeFinder $attributeFinder,
private readonly ValueResolver $valueResolver,
private readonly ParentClassMethodTypeOverrideGuard $parentClassMethodOverrideGuard
) {
}

Expand Down Expand Up @@ -113,6 +115,10 @@ public function refactor(Node $node): ?Node
return null;
}

if ($node->isAbstract()) {
return null;
}

$propertyMetadatas = [];

foreach ($node->getMethods() as $classMethod) {
Expand Down Expand Up @@ -218,7 +224,13 @@ private function shouldSkipClassMethod(ClassMethod $classMethod): bool
return true;
}

return ! $this->controllerMethodAnalyzer->isAction($classMethod);
if (! $this->controllerMethodAnalyzer->isAction($classMethod)) {
return true;
}

return $this->parentClassMethodOverrideGuard->hasParentClassMethod(
$classMethod
);
}

/**
Expand Down