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

Updated Rector to commit 19d01b91e2

Browse Source 
19d01b91e2 [DeadCode] Skip clone and new self on RemoveUnusedPrivatePropertyRector (#1215)
This commit is contained in:
Tomas Votruba 2021-11-12 13:45:18 +00:00
parent 3a883b2fc9
commit b45d060eb9
8 changed files with 161 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
rules/Removing/NodeAnalyzer/ForbiddenPropertyRemovalAnalyzer.php Normal file
View File

@ -0,0 +1,117 @@
<?php
declare (strict_types=1);
namespace Rector\Removing\NodeAnalyzer;
use PhpParser\Node;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\Clone_;
use PhpParser\Node\Expr\New_;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PhpParser\Node\Stmt\ClassLike;
use PHPStan\Type\ObjectType;
use PHPStan\Type\ThisType;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\NodeTypeResolver;
final class ForbiddenPropertyRemovalAnalyzer
{
/**
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
/**
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
*/
private $nodeComparator;
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @var \Rector\NodeTypeResolver\NodeTypeResolver
*/
private $nodeTypeResolver;
/**
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
*/
private $propertyFetchAnalyzer;
public function __construct(\Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\NodeTypeResolver\NodeTypeResolver $nodeTypeResolver, \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer $propertyFetchAnalyzer)
{
$this->betterNodeFinder = $betterNodeFinder;
$this->nodeComparator = $nodeComparator;
$this->nodeNameResolver = $nodeNameResolver;
$this->nodeTypeResolver = $nodeTypeResolver;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
}
public function isForbiddenInNewCurrentClassNameSelfClone(string $propertyName, ?\PhpParser\Node\Stmt\ClassLike $classLike) : bool
{
if (!$classLike instanceof \PhpParser\Node\Stmt\ClassLike) {
return \false;
}
$methods = $classLike->getMethods();
foreach ($methods as $method) {
$isInNewCurrentClassNameSelfClone = (bool) $this->betterNodeFinder->findFirst((array) $method->getStmts(), function (\PhpParser\Node $subNode) use($classLike, $propertyName) : bool {
if ($subNode instanceof \PhpParser\Node\Expr\New_) {
return $this->isPropertyNameUsedAfterNewOrClone($subNode, $classLike, $propertyName);
}
if ($subNode instanceof \PhpParser\Node\Expr\Clone_) {
return $this->isPropertyNameUsedAfterNewOrClone($subNode, $classLike, $propertyName);
}
return \false;
});
if ($isInNewCurrentClassNameSelfClone) {
return \true;
}
}
return \false;
}
/**
* @param \PhpParser\Node\Expr\Clone_|\PhpParser\Node\Expr\New_ $expr
*/
private function isPropertyNameUsedAfterNewOrClone($expr, \PhpParser\Node\Stmt\ClassLike $classLike, string $propertyName) : bool
{
$parentAssign = $this->betterNodeFinder->findParentType($expr, \PhpParser\Node\Expr\Assign::class);
if (!$parentAssign instanceof \PhpParser\Node\Expr\Assign) {
return \false;
}
$className = (string) $this->nodeNameResolver->getName($classLike);
$type = $expr instanceof \PhpParser\Node\Expr\New_ ? $this->nodeTypeResolver->getType($expr->class) : $this->nodeTypeResolver->getType($expr->expr);
if ($expr instanceof \PhpParser\Node\Expr\Clone_ && $type instanceof \PHPStan\Type\ThisType) {
$type = $type->getStaticObjectType();
}
if ($type instanceof \PHPStan\Type\ObjectType) {
return $this->isFoundAfterCloneOrNew($type, $expr, $parentAssign, $className, $propertyName);
}
return \false;
}
/**
* @param \PhpParser\Node\Expr\Clone_|\PhpParser\Node\Expr\New_ $expr
*/
private function isFoundAfterCloneOrNew(\PHPStan\Type\ObjectType $objectType, $expr, \PhpParser\Node\Expr\Assign $parentAssign, string $className, string $propertyName) : bool
{
if ($objectType->getClassName() !== $className) {
return \false;
}
return (bool) $this->betterNodeFinder->findFirstNext($expr, function (\PhpParser\Node $subNode) use($parentAssign, $propertyName) : bool {
if (!$this->propertyFetchAnalyzer->isPropertyFetch($subNode)) {
return \false;
}
/** @var PropertyFetch|StaticPropertyFetch $subNode */
$propertyFetchName = (string) $this->nodeNameResolver->getName($subNode);
if ($subNode instanceof \PhpParser\Node\Expr\PropertyFetch) {
if (!$this->nodeComparator->areNodesEqual($subNode->var, $parentAssign->var)) {
return \false;
}
return $propertyFetchName === $propertyName;
}
if (!$this->nodeComparator->areNodesEqual($subNode->class, $parentAssign->var)) {
return \false;
}
return $propertyFetchName === $propertyName;
});
}
}

61
rules/Removing/NodeManipulator/ComplexNodeRemover.php
View File

@ -9,6 +9,7 @@ use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PhpParser\Node\Param;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Property;
use Rector\Core\PhpParser\Comparing\NodeComparator;
@ -19,7 +20,7 @@ use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeRemoval\AssignRemover;
use Rector\NodeRemoval\NodeRemover;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\PostRector\Collector\NodesToRemoveCollector;
use Rector\Removing\NodeAnalyzer\ForbiddenPropertyRemovalAnalyzer;
final class ComplexNodeRemover
{
/**
@ -42,23 +43,23 @@ final class ComplexNodeRemover
* @var \Rector\NodeRemoval\NodeRemover
*/
private $nodeRemover;
/**
* @var \Rector\PostRector\Collector\NodesToRemoveCollector
*/
private $nodesToRemoveCollector;
/**
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
*/
private $nodeComparator;
public function __construct(\Rector\NodeRemoval\AssignRemover $assignRemover, \Rector\Core\PhpParser\NodeFinder\PropertyFetchFinder $propertyFetchFinder, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\NodeRemoval\NodeRemover $nodeRemover, \Rector\PostRector\Collector\NodesToRemoveCollector $nodesToRemoveCollector, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator)
/**
* @var \Rector\Removing\NodeAnalyzer\ForbiddenPropertyRemovalAnalyzer
*/
private $forbiddenPropertyRemovalAnalyzer;
public function __construct(\Rector\NodeRemoval\AssignRemover $assignRemover, \Rector\Core\PhpParser\NodeFinder\PropertyFetchFinder $propertyFetchFinder, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\NodeRemoval\NodeRemover $nodeRemover, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator, \Rector\Removing\NodeAnalyzer\ForbiddenPropertyRemovalAnalyzer $forbiddenPropertyRemovalAnalyzer)
{
$this->assignRemover = $assignRemover;
$this->propertyFetchFinder = $propertyFetchFinder;
$this->nodeNameResolver = $nodeNameResolver;
$this->betterNodeFinder = $betterNodeFinder;
$this->nodeRemover = $nodeRemover;
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
$this->nodeComparator = $nodeComparator;
$this->forbiddenPropertyRemovalAnalyzer = $forbiddenPropertyRemovalAnalyzer;
}
/**
* @param string[] $classMethodNamesToSkip
@ -68,7 +69,6 @@ final class ComplexNodeRemover
$shouldKeepProperty = \false;
$propertyFetches = $this->propertyFetchFinder->findPrivatePropertyFetches($property);
$assigns = [];
$propertyNames = [];
foreach ($propertyFetches as $propertyFetch) {
if ($this->shouldSkipPropertyForClassMethod($propertyFetch, $classMethodNamesToSkip)) {
$shouldKeepProperty = \true;
@ -78,38 +78,23 @@ final class ComplexNodeRemover
if (!$assign instanceof \PhpParser\Node\Expr\Assign) {
return;
}
$propertyName = (string) $this->nodeNameResolver->getName($propertyFetch);
$propertyNames[] = $propertyName;
$assigns[$propertyName][] = $assign;
$assigns[] = $assign;
}
$this->processRemovePropertyAssigns($assigns, $propertyNames);
$this->processRemovePropertyAssigns($assigns);
if ($shouldKeepProperty) {
return;
}
// remove __construct param
/** @var Property $property */
$this->nodeRemover->removeNode($property);
foreach ($property->props as $prop) {
if (!$this->nodesToRemoveCollector->isNodeRemoved($prop)) {
// if the property has at least one node left -> return
return;
}
}
$this->nodeRemover->removeNode($property);
}
/**
* @param array<string, Assign[]> $assigns
* @param string[] $propertyNames
* @param Assign[] $assigns
*/
private function processRemovePropertyAssigns(array $assigns, array $propertyNames) : void
private function processRemovePropertyAssigns(array $assigns) : void
{
$propertyNames = \array_unique($propertyNames);
foreach ($propertyNames as $propertyName) {
foreach ($assigns[$propertyName] as $propertyNameAssign) {
// remove assigns
$this->assignRemover->removeAssignNode($propertyNameAssign);
$this->removeConstructorDependency($propertyNameAssign);
}
foreach ($assigns as $assign) {
// remove assigns
$this->assignRemover->removeAssignNode($assign);
$this->removeConstructorDependency($assign);
}
}
/**
@ -143,6 +128,11 @@ final class ComplexNodeRemover
if ($isInExpr) {
return null;
}
$classLike = $this->betterNodeFinder->findParentType($expr, \PhpParser\Node\Stmt\ClassLike::class);
$propertyName = (string) $this->nodeNameResolver->getName($expr);
if ($this->forbiddenPropertyRemovalAnalyzer->isForbiddenInNewCurrentClassNameSelfClone($propertyName, $classLike)) {
return null;
}
return $assign;
}
private function removeConstructorDependency(\PhpParser\Node\Expr\Assign $assign) : void
@ -206,12 +196,7 @@ final class ComplexNodeRemover
}
private function isExpressionVariableNotAssign(\PhpParser\Node $node) : bool
{
if ($node !== null) {
$expressionVariable = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::PARENT_NODE);
if (!$expressionVariable instanceof \PhpParser\Node\Expr\Assign) {
return \true;
}
}
return \false;
$expressionVariable = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::PARENT_NODE);
return !$expressionVariable instanceof \PhpParser\Node\Expr\Assign;
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'af81708d80025b5af4a556370127b3946c046133';
public const PACKAGE_VERSION = '19d01b91e2eb2f4961ad8f6c226743cbf9aa4db8';
/**
* @var string
*/
public const RELEASE_DATE = '2021-11-12 10:31:47';
public const RELEASE_DATE = '2021-11-12 14:27:58';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211112\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit9e813c2df08d1dd85839f8a772ec8e90::getLoader();
return ComposerAutoloaderInit7bc969ebdc0fee9bedfa13cdb224983f::getLoader();

1
vendor/composer/autoload_classmap.php vendored
View File

@ -2559,6 +2559,7 @@ return array(
'Rector\\RemovingStatic\\Rector\\Property\\DesiredPropertyClassMethodTypeToDynamicRector' => $baseDir . '/rules/RemovingStatic/Rector/Property/DesiredPropertyClassMethodTypeToDynamicRector.php',
'Rector\\RemovingStatic\\Rector\\StaticCall\\DesiredStaticCallTypeToDynamicRector' => $baseDir . '/rules/RemovingStatic/Rector/StaticCall/DesiredStaticCallTypeToDynamicRector.php',
'Rector\\RemovingStatic\\Rector\\StaticPropertyFetch\\DesiredStaticPropertyFetchTypeToDynamicRector' => $baseDir . '/rules/RemovingStatic/Rector/StaticPropertyFetch/DesiredStaticPropertyFetchTypeToDynamicRector.php',
'Rector\\Removing\\NodeAnalyzer\\ForbiddenPropertyRemovalAnalyzer' => $baseDir . '/rules/Removing/NodeAnalyzer/ForbiddenPropertyRemovalAnalyzer.php',
'Rector\\Removing\\NodeManipulator\\ComplexNodeRemover' => $baseDir . '/rules/Removing/NodeManipulator/ComplexNodeRemover.php',
'Rector\\Removing\\Rector\\ClassMethod\\ArgumentRemoverRector' => $baseDir . '/rules/Removing/Rector/ClassMethod/ArgumentRemoverRector.php',
'Rector\\Removing\\Rector\\Class_\\RemoveInterfacesRector' => $baseDir . '/rules/Removing/Rector/Class_/RemoveInterfacesRector.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit9e813c2df08d1dd85839f8a772ec8e90
class ComposerAutoloaderInit7bc969ebdc0fee9bedfa13cdb224983f
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit9e813c2df08d1dd85839f8a772ec8e90
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit9e813c2df08d1dd85839f8a772ec8e90', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit7bc969ebdc0fee9bedfa13cdb224983f', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit9e813c2df08d1dd85839f8a772ec8e90', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit7bc969ebdc0fee9bedfa13cdb224983f', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit9e813c2df08d1dd85839f8a772ec8e90::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit7bc969ebdc0fee9bedfa13cdb224983f::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit9e813c2df08d1dd85839f8a772ec8e90
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit9e813c2df08d1dd85839f8a772ec8e90::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit7bc969ebdc0fee9bedfa13cdb224983f::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire9e813c2df08d1dd85839f8a772ec8e90($fileIdentifier, $file);
composerRequire7bc969ebdc0fee9bedfa13cdb224983f($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire9e813c2df08d1dd85839f8a772ec8e90($fileIdentifier, $file)
function composerRequire7bc969ebdc0fee9bedfa13cdb224983f($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit9e813c2df08d1dd85839f8a772ec8e90
class ComposerStaticInit7bc969ebdc0fee9bedfa13cdb224983f
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -2889,6 +2889,7 @@ class ComposerStaticInit9e813c2df08d1dd85839f8a772ec8e90
'Rector\\RemovingStatic\\Rector\\Property\\DesiredPropertyClassMethodTypeToDynamicRector' => __DIR__ . '/../..' . '/rules/RemovingStatic/Rector/Property/DesiredPropertyClassMethodTypeToDynamicRector.php',
'Rector\\RemovingStatic\\Rector\\StaticCall\\DesiredStaticCallTypeToDynamicRector' => __DIR__ . '/../..' . '/rules/RemovingStatic/Rector/StaticCall/DesiredStaticCallTypeToDynamicRector.php',
'Rector\\RemovingStatic\\Rector\\StaticPropertyFetch\\DesiredStaticPropertyFetchTypeToDynamicRector' => __DIR__ . '/../..' . '/rules/RemovingStatic/Rector/StaticPropertyFetch/DesiredStaticPropertyFetchTypeToDynamicRector.php',
'Rector\\Removing\\NodeAnalyzer\\ForbiddenPropertyRemovalAnalyzer' => __DIR__ . '/../..' . '/rules/Removing/NodeAnalyzer/ForbiddenPropertyRemovalAnalyzer.php',
'Rector\\Removing\\NodeManipulator\\ComplexNodeRemover' => __DIR__ . '/../..' . '/rules/Removing/NodeManipulator/ComplexNodeRemover.php',
'Rector\\Removing\\Rector\\ClassMethod\\ArgumentRemoverRector' => __DIR__ . '/../..' . '/rules/Removing/Rector/ClassMethod/ArgumentRemoverRector.php',
'Rector\\Removing\\Rector\\Class_\\RemoveInterfacesRector' => __DIR__ . '/../..' . '/rules/Removing/Rector/Class_/RemoveInterfacesRector.php',
@ -3535,9 +3536,9 @@ class ComposerStaticInit9e813c2df08d1dd85839f8a772ec8e90
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit9e813c2df08d1dd85839f8a772ec8e90::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit9e813c2df08d1dd85839f8a772ec8e90::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit9e813c2df08d1dd85839f8a772ec8e90::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit7bc969ebdc0fee9bedfa13cdb224983f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit7bc969ebdc0fee9bedfa13cdb224983f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit7bc969ebdc0fee9bedfa13cdb224983f::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -12,8 +12,8 @@ if (!class_exists('GenerateChangelogCommand', false) && !interface_exists('Gener
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20211112\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit9e813c2df08d1dd85839f8a772ec8e90', false) && !interface_exists('ComposerAutoloaderInit9e813c2df08d1dd85839f8a772ec8e90', false) && !trait_exists('ComposerAutoloaderInit9e813c2df08d1dd85839f8a772ec8e90', false)) {
spl_autoload_call('RectorPrefix20211112\ComposerAutoloaderInit9e813c2df08d1dd85839f8a772ec8e90');
if (!class_exists('ComposerAutoloaderInit7bc969ebdc0fee9bedfa13cdb224983f', false) && !interface_exists('ComposerAutoloaderInit7bc969ebdc0fee9bedfa13cdb224983f', false) && !trait_exists('ComposerAutoloaderInit7bc969ebdc0fee9bedfa13cdb224983f', false)) {
spl_autoload_call('RectorPrefix20211112\ComposerAutoloaderInit7bc969ebdc0fee9bedfa13cdb224983f');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20211112\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3309,9 +3309,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211112\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire9e813c2df08d1dd85839f8a772ec8e90')) {
function composerRequire9e813c2df08d1dd85839f8a772ec8e90() {
return \RectorPrefix20211112\composerRequire9e813c2df08d1dd85839f8a772ec8e90(...func_get_args());
if (!function_exists('composerRequire7bc969ebdc0fee9bedfa13cdb224983f')) {
function composerRequire7bc969ebdc0fee9bedfa13cdb224983f() {
return \RectorPrefix20211112\composerRequire7bc969ebdc0fee9bedfa13cdb224983f(...func_get_args());
}
}
if (!function_exists('parseArgs')) {