octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-22 02:52:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove ctor dependency on property/assign removal

Browse Source
This commit is contained in:
TomasVotruba 2020-03-26 22:57:56 +01:00
parent 47c8666088
commit 9d4be977c4
4 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rules/dead-code/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/Fixture/deal_with_property_fetches.php.inc
View File

@ -26,7 +26,7 @@ namespace Rector\DeadCode\Tests\Rector\Class_\RemoveSetterOnlyPropertyAndMethodC
class MyClass
{
public function __construct($unused)
public function __construct()
{
}
}

2
rules/dead-code/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/Fixture/in_constructor.php.inc
View File

@ -20,7 +20,7 @@ namespace Rector\DeadCode\Tests\Rector\Class_\RemoveSetterOnlyPropertyAndMethodC
class InConstructor
{
public function __construct($name)
public function __construct()
{
}
}

2
rules/dead-code/tests/Rector/Property/RemoveUnusedPrivatePropertyRector/Fixture/constructor_only.php.inc
View File

@ -23,7 +23,7 @@ namespace Rector\DeadCode\Tests\Rector\Property\RemoveUnusedPrivatePropertyRecto
class ConstructorOnly
{
public function __construct(int $contentFinder)
public function __construct()
{
}
}

44
src/Rector/AbstractRector/ComplexRemovalTrait.php
View File

@ -12,6 +12,7 @@ use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Property;
@ -19,6 +20,7 @@ use PhpParser\Node\Stmt\PropertyProperty;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\PhpParser\Node\Commander\NodeRemovingCommander;
use Rector\Core\PhpParser\Node\Manipulator\PropertyManipulator;
use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
use Rector\DeadCode\NodeManipulator\LivingCodeManipulator;
use Rector\NodeCollector\NodeCollector\ParsedNodeCollector;
use Rector\NodeCollector\NodeFinder\FunctionLikeParsedNodesFinder;
@ -41,6 +43,11 @@ trait ComplexRemovalTrait
*/
protected $livingCodeManipulator;
/**
* @var BetterStandardPrinter
*/
protected $betterStandardPrinter;
/**
* @var PropertyManipulator
*/
@ -52,11 +59,13 @@ trait ComplexRemovalTrait
public function autowireComplextRemovalTrait(
PropertyManipulator $propertyManipulator,
ParsedNodeCollector $parsedNodeCollector,
LivingCodeManipulator $livingCodeManipulator
LivingCodeManipulator $livingCodeManipulator,
BetterStandardPrinter $betterStandardPrinter
): void {
$this->parsedNodeCollector = $parsedNodeCollector;
$this->propertyManipulator = $propertyManipulator;
$this->livingCodeManipulator = $livingCodeManipulator;
$this->betterStandardPrinter = $betterStandardPrinter;
}
abstract protected function removeNode(Node $node): void;
@ -91,15 +100,19 @@ trait ComplexRemovalTrait
continue;
}
// remove assigns
$assign = $this->resolveAssign($propertyFetch);
$this->removeAssignNode($assign);
$this->removeConstructorDependency($assign);
}
if ($shouldKeepProperty) {
return;
}
// remove __contruct param
/** @var Property $property */
$property = $propertyProperty->getAttribute(AttributeKey::PARENT_NODE);
$this->removeNode($propertyProperty);
@ -185,4 +198,31 @@ trait ComplexRemovalTrait
return $assign;
}
private function removeConstructorDependency(Assign $assign): void
{
$methodName = $assign->getAttribute(AttributeKey::METHOD_NAME);
if ($methodName !== '__construct') {
return;
}
$class = $assign->getAttribute(AttributeKey::CLASS_NODE);
if (! $class instanceof Class_) {
return;
}
/** @var Class_|null $class */
$constructClassMethod = $class->getMethod('__construct');
if ($constructClassMethod === null) {
return;
}
foreach ($constructClassMethod->getParams() as $param) {
if (! $this->betterStandardPrinter->areNodesWithoutCommentsEqual($param->var, $assign->expr)) {
continue;
}
$this->removeNode($param);
}
}
}