octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit cb1b0c7348d1e80806b2e600823dbfa38b9836c7 

cb1b0c7348 [Renaming] Add RenamedNameCollector to ensure remove uses on auto import on ClassRenamingPostRector with verify there is Node name that renamed (#5232)
This commit is contained in:
Tomas Votruba 2023-11-07 21:52:18 +00:00
parent 9e54649587
commit 6786dfbdb1
9 changed files with 93 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/BetterPhpDocParser/PhpDocManipulator/PhpDocClassRenamer.php
View File

@ -12,6 +12,7 @@ use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher;
use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\Renaming\Collector\RenamedNameCollector;
final class PhpDocClassRenamer
{
/**
@ -19,9 +20,15 @@ final class PhpDocClassRenamer
* @var \Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher
*/
private $classAnnotationMatcher;
public function __construct(ClassAnnotationMatcher $classAnnotationMatcher)
/**
* @readonly
* @var \Rector\Renaming\Collector\RenamedNameCollector
*/
private $renamedNameCollector;
public function __construct(ClassAnnotationMatcher $classAnnotationMatcher, RenamedNameCollector $renamedNameCollector)
{
$this->classAnnotationMatcher = $classAnnotationMatcher;
$this->renamedNameCollector = $renamedNameCollector;
}
/**
* Covers annotations like @ORM, @Serializer, @Assert etc
@ -64,6 +71,7 @@ final class PhpDocClassRenamer
if ($classNameStringNode->value !== $oldClass) {
continue;
}
$this->renamedNameCollector->add($oldClass);
$classNameStringNode->value = $newClass;
// trigger reprint
$classNameArrayItemNode->setAttribute(PhpDocAttributeKey::ORIG_NODE, null);
@ -99,6 +107,7 @@ final class PhpDocClassRenamer
$classNameStringNode->value = $newClass;
continue;
}
$this->renamedNameCollector->add($oldClass);
$classNameStringNode->value = Strings::replace($classNameStringNode->value, '#\\b' . \preg_quote($oldClass, '#') . '\\b#', $newClass);
$classNameArrayItemNode->setAttribute(PhpDocAttributeKey::ORIG_NODE, null);
$hasChanged = \true;
@ -138,6 +147,7 @@ final class PhpDocClassRenamer
if ($tagFullyQualifiedName !== $oldClass) {
continue;
}
$this->renamedNameCollector->add($oldClass);
$targetEntityStringNode->value = $newClass;
$targetEntityArrayItemNode->setAttribute(PhpDocAttributeKey::ORIG_NODE, null);
$hasChanged = \true;

14
packages/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php
View File

@ -19,6 +19,7 @@ use Rector\Naming\Naming\UseImportsResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\ValueObject\OldToNewType;
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
use Rector\Renaming\Collector\RenamedNameCollector;
use Rector\StaticTypeMapper\StaticTypeMapper;
use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
@ -33,6 +34,11 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
* @var \Rector\Naming\Naming\UseImportsResolver
*/
private $useImportsResolver;
/**
* @readonly
* @var \Rector\Renaming\Collector\RenamedNameCollector
*/
private $renamedNameCollector;
/**
* @var OldToNewType[]
*/
@ -45,10 +51,11 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
* @var PhpNode|null
*/
private $currentPhpNode;
public function __construct(StaticTypeMapper $staticTypeMapper, UseImportsResolver $useImportsResolver)
public function __construct(StaticTypeMapper $staticTypeMapper, UseImportsResolver $useImportsResolver, RenamedNameCollector $renamedNameCollector)
{
$this->staticTypeMapper = $staticTypeMapper;
$this->useImportsResolver = $useImportsResolver;
$this->renamedNameCollector = $renamedNameCollector;
}
public function setCurrentPhpNode(PhpNode $phpNode) : void
{
@ -81,7 +88,9 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
// make sure to compare FQNs
$objectType = $this->expandShortenedObjectType($staticType);
foreach ($this->oldToNewTypes as $oldToNewType) {
if (!$objectType->equals($oldToNewType->getOldType())) {
/** @var ObjectType $oldType */
$oldType = $oldToNewType->getOldType();
if (!$objectType->equals($oldType)) {
continue;
}
$newTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($oldToNewType->getNewType());
@ -91,6 +100,7 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
$newTypeNode->setAttribute(PhpDocAttributeKey::PARENT, $parentType);
}
$this->hasChanged = \true;
$this->renamedNameCollector->add($oldType->getClassName());
return $newTypeNode;
}
return null;

18
packages/PostRector/Rector/ClassRenamingPostRector.php
View File

@ -16,6 +16,7 @@ use Rector\Core\Configuration\RenamedClassesDataCollector;
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Renaming\NodeManipulator\ClassRenamer;
use Rector\Renaming\Collector\RenamedNameCollector;
final class ClassRenamingPostRector extends \Rector\PostRector\Rector\AbstractPostRector
{
/**
@ -33,15 +34,21 @@ final class ClassRenamingPostRector extends \Rector\PostRector\Rector\AbstractPo
* @var \Rector\CodingStyle\Application\UseImportsRemover
*/
private $useImportsRemover;
/**
* @readonly
* @var \Rector\Renaming\Collector\RenamedNameCollector
*/
private $renamedNameCollector;
/**
* @var \Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace|\PhpParser\Node\Stmt\Namespace_|null
*/
private $rootNode = null;
public function __construct(ClassRenamer $classRenamer, RenamedClassesDataCollector $renamedClassesDataCollector, UseImportsRemover $useImportsRemover)
public function __construct(ClassRenamer $classRenamer, RenamedClassesDataCollector $renamedClassesDataCollector, UseImportsRemover $useImportsRemover, RenamedNameCollector $renamedNameCollector)
{
$this->classRenamer = $classRenamer;
$this->renamedClassesDataCollector = $renamedClassesDataCollector;
$this->useImportsRemover = $useImportsRemover;
$this->renamedNameCollector = $renamedNameCollector;
}
/**
* @param Stmt[] $nodes
@ -88,4 +95,13 @@ final class ClassRenamingPostRector extends \Rector\PostRector\Rector\AbstractPo
$this->rootNode->stmts = $this->useImportsRemover->removeImportsFromStmts($this->rootNode->stmts, $removedUses);
return $result;
}
/**
* @param Node[] $nodes
* @return Stmt[]
*/
public function afterTraverse(array $nodes) : array
{
$this->renamedNameCollector->reset();
return $nodes;
}
}

18
rules/CodingStyle/Application/UseImportsRemover.php
View File

@ -5,8 +5,18 @@ namespace Rector\CodingStyle\Application;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Use_;
use Rector\Renaming\Collector\RenamedNameCollector;
final class UseImportsRemover
{
/**
* @readonly
* @var \Rector\Renaming\Collector\RenamedNameCollector
*/
private $renamedNameCollector;
public function __construct(RenamedNameCollector $renamedNameCollector)
{
$this->renamedNameCollector = $renamedNameCollector;
}
/**
* @param Stmt[] $stmts
* @param string[] $removedUses
@ -33,9 +43,13 @@ final class UseImportsRemover
{
foreach ($use->uses as $usesKey => $useUse) {
$useName = $useUse->name->toString();
if (\in_array($useName, $removedUses, \true)) {
unset($use->uses[$usesKey]);
if (!\in_array($useName, $removedUses, \true)) {
continue;
}
if (!$this->renamedNameCollector->has($useName)) {
continue;
}
unset($use->uses[$usesKey]);
}
return $use;
}

24
rules/Renaming/Collector/RenamedNameCollector.php Normal file
View File

@ -0,0 +1,24 @@
<?php
declare (strict_types=1);
namespace Rector\Renaming\Collector;
final class RenamedNameCollector
{
/**
* @var string[]
*/
private $names = [];
public function add(string $name) : void
{
$this->names[] = $name;
}
public function has(string $name) : bool
{
return \in_array($name, $this->names, \true);
}
public function reset() : void
{
$this->names = [];
}
}

10
rules/Renaming/NodeManipulator/ClassRenamer.php
View File

@ -28,6 +28,7 @@ use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockClassRenamer;
use Rector\NodeTypeResolver\ValueObject\OldToNewType;
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
use Rector\Renaming\Collector\RenamedNameCollector;
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
final class ClassRenamer
{
@ -81,6 +82,11 @@ final class ClassRenamer
* @var \Rector\Comments\NodeDocBlock\DocBlockUpdater
*/
private $docBlockUpdater;
/**
* @readonly
* @var \Rector\Renaming\Collector\RenamedNameCollector
*/
private $renamedNameCollector;
/**
* @var string[]
*/
@ -89,7 +95,7 @@ final class ClassRenamer
* @var array<string, OldToNewType[]>
*/
private $oldToNewTypesByCacheKey = [];
public function __construct(BetterNodeFinder $betterNodeFinder, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, ClassNaming $classNaming, NodeNameResolver $nodeNameResolver, PhpDocClassRenamer $phpDocClassRenamer, PhpDocInfoFactory $phpDocInfoFactory, DocBlockClassRenamer $docBlockClassRenamer, ReflectionProvider $reflectionProvider, FileHasher $fileHasher, DocBlockUpdater $docBlockUpdater)
public function __construct(BetterNodeFinder $betterNodeFinder, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, ClassNaming $classNaming, NodeNameResolver $nodeNameResolver, PhpDocClassRenamer $phpDocClassRenamer, PhpDocInfoFactory $phpDocInfoFactory, DocBlockClassRenamer $docBlockClassRenamer, ReflectionProvider $reflectionProvider, FileHasher $fileHasher, DocBlockUpdater $docBlockUpdater, RenamedNameCollector $renamedNameCollector)
{
$this->betterNodeFinder = $betterNodeFinder;
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
@ -101,6 +107,7 @@ final class ClassRenamer
$this->reflectionProvider = $reflectionProvider;
$this->fileHasher = $fileHasher;
$this->docBlockUpdater = $docBlockUpdater;
$this->renamedNameCollector = $renamedNameCollector;
}
/**
* @param array<string, string> $oldToNewClasses
@ -179,6 +186,7 @@ final class ClassRenamer
if ($this->shouldSkip($newName, $name)) {
return null;
}
$this->renamedNameCollector->add($stringName);
return new FullyQualified($newName);
}
/**

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '290f2a03d53d0b8da35beb973d724f95a77983cb';
public const PACKAGE_VERSION = 'cb1b0c7348d1e80806b2e600823dbfa38b9836c7';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-11-08 02:10:08';
public const RELEASE_DATE = '2023-11-07 22:49:21';
/**
* @var int
*/

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1969,6 +1969,7 @@ return array(
'Rector\\Removing\\Rector\\FuncCall\\RemoveFuncCallRector' => $baseDir . '/rules/Removing/Rector/FuncCall/RemoveFuncCallRector.php',
'Rector\\Removing\\ValueObject\\ArgumentRemover' => $baseDir . '/rules/Removing/ValueObject/ArgumentRemover.php',
'Rector\\Removing\\ValueObject\\RemoveFuncCallArg' => $baseDir . '/rules/Removing/ValueObject/RemoveFuncCallArg.php',
'Rector\\Renaming\\Collector\\RenamedNameCollector' => $baseDir . '/rules/Renaming/Collector/RenamedNameCollector.php',
'Rector\\Renaming\\Contract\\MethodCallRenameInterface' => $baseDir . '/rules/Renaming/Contract/MethodCallRenameInterface.php',
'Rector\\Renaming\\Contract\\RenameAnnotationInterface' => $baseDir . '/rules/Renaming/Contract/RenameAnnotationInterface.php',
'Rector\\Renaming\\Contract\\RenameClassConstFetchInterface' => $baseDir . '/rules/Renaming/Contract/RenameClassConstFetchInterface.php',

1
vendor/composer/autoload_static.php vendored
View File

@ -2187,6 +2187,7 @@ class ComposerStaticInit18ad0e678efbbb500e116f7c54cccdd4
'Rector\\Removing\\Rector\\FuncCall\\RemoveFuncCallRector' => __DIR__ . '/../..' . '/rules/Removing/Rector/FuncCall/RemoveFuncCallRector.php',
'Rector\\Removing\\ValueObject\\ArgumentRemover' => __DIR__ . '/../..' . '/rules/Removing/ValueObject/ArgumentRemover.php',
'Rector\\Removing\\ValueObject\\RemoveFuncCallArg' => __DIR__ . '/../..' . '/rules/Removing/ValueObject/RemoveFuncCallArg.php',
'Rector\\Renaming\\Collector\\RenamedNameCollector' => __DIR__ . '/../..' . '/rules/Renaming/Collector/RenamedNameCollector.php',
'Rector\\Renaming\\Contract\\MethodCallRenameInterface' => __DIR__ . '/../..' . '/rules/Renaming/Contract/MethodCallRenameInterface.php',
'Rector\\Renaming\\Contract\\RenameAnnotationInterface' => __DIR__ . '/../..' . '/rules/Renaming/Contract/RenameAnnotationInterface.php',
'Rector\\Renaming\\Contract\\RenameClassConstFetchInterface' => __DIR__ . '/../..' . '/rules/Renaming/Contract/RenameClassConstFetchInterface.php',