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 f6063588c0107450e51333934308f71434722f68 

f6063588c0 [DX] Lower current node dependency - pass it directly to doc node parsing (#5023)
This commit is contained in:
Tomas Votruba 2023-09-15 11:53:42 +00:00
parent 224235c3f7
commit 810ae4c396
18 changed files with 84 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php
View File

@ -14,7 +14,6 @@ use Rector\BetterPhpDocParser\PhpDocParser\BetterPhpDocParser;
use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
use Rector\Core\Configuration\CurrentNodeProvider;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\StaticTypeMapper\StaticTypeMapper;
final class PhpDocInfoFactory
@ -24,11 +23,6 @@ final class PhpDocInfoFactory
* @var \Rector\BetterPhpDocParser\PhpDocNodeMapper
*/
private $phpDocNodeMapper;
/**
* @readonly
* @var \Rector\Core\Configuration\CurrentNodeProvider
*/
private $currentNodeProvider;
/**
* @readonly
* @var \PHPStan\PhpDocParser\Lexer\Lexer
@ -58,10 +52,9 @@ final class PhpDocInfoFactory
* @var array<int, PhpDocInfo>
*/
private $phpDocInfosByObjectId = [];
public function __construct(PhpDocNodeMapper $phpDocNodeMapper, CurrentNodeProvider $currentNodeProvider, Lexer $lexer, BetterPhpDocParser $betterPhpDocParser, StaticTypeMapper $staticTypeMapper, AnnotationNaming $annotationNaming, PhpDocNodeByTypeFinder $phpDocNodeByTypeFinder)
public function __construct(PhpDocNodeMapper $phpDocNodeMapper, Lexer $lexer, BetterPhpDocParser $betterPhpDocParser, StaticTypeMapper $staticTypeMapper, AnnotationNaming $annotationNaming, PhpDocNodeByTypeFinder $phpDocNodeByTypeFinder)
{
$this->phpDocNodeMapper = $phpDocNodeMapper;
$this->currentNodeProvider = $currentNodeProvider;
$this->lexer = $lexer;
$this->betterPhpDocParser = $betterPhpDocParser;
$this->staticTypeMapper = $staticTypeMapper;
@ -87,8 +80,6 @@ final class PhpDocInfoFactory
if (isset($this->phpDocInfosByObjectId[$objectId])) {
return $this->phpDocInfosByObjectId[$objectId];
}
/** @see \Rector\BetterPhpDocParser\PhpDocParser\DoctrineAnnotationDecorator::decorate() */
$this->currentNodeProvider->setNode($node);
$docComment = $node->getDocComment();
if (!$docComment instanceof Doc) {
if ($node->getComments() === []) {
@ -112,8 +103,6 @@ final class PhpDocInfoFactory
*/
public function createEmpty(Node $node) : \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo
{
/** @see \Rector\BetterPhpDocParser\PhpDocParser\DoctrineAnnotationDecorator::decorate() */
$this->currentNodeProvider->setNode($node);
$phpDocNode = new PhpDocNode([]);
$phpDocInfo = $this->createFromPhpDocNode($phpDocNode, new BetterTokenIterator([]), $node);
// multiline by default

16
packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php
View File

@ -143,7 +143,7 @@ final class DoctrineAnnotationDecorator implements PhpDocNodeDecoratorInterface
foreach ($phpDocNode->children as $key => $phpDocChildNode) {
// the @\FQN use case
if ($phpDocChildNode instanceof PhpDocTextNode) {
$spacelessPhpDocTagNode = $this->resolveFqnAnnotationSpacelessPhpDocTagNode($phpDocChildNode);
$spacelessPhpDocTagNode = $this->resolveFqnAnnotationSpacelessPhpDocTagNode($phpDocChildNode, $currentPhpNode);
if (!$spacelessPhpDocTagNode instanceof SpacelessPhpDocTagNode) {
continue;
}
@ -162,7 +162,7 @@ final class DoctrineAnnotationDecorator implements PhpDocNodeDecoratorInterface
if (\strpos($fullyQualifiedAnnotationClass, '\\') === \false && !\in_array($fullyQualifiedAnnotationClass, self::ALLOWED_SHORT_ANNOTATIONS, \true)) {
continue;
}
$spacelessPhpDocTagNode = $this->createSpacelessPhpDocTagNode($phpDocChildNode->name, $phpDocChildNode->value, $fullyQualifiedAnnotationClass);
$spacelessPhpDocTagNode = $this->createSpacelessPhpDocTagNode($phpDocChildNode->name, $phpDocChildNode->value, $fullyQualifiedAnnotationClass, $currentPhpNode);
$this->attributeMirrorer->mirror($phpDocChildNode, $spacelessPhpDocTagNode);
$phpDocNode->children[$key] = $spacelessPhpDocTagNode;
}
@ -191,17 +191,17 @@ final class DoctrineAnnotationDecorator implements PhpDocNodeDecoratorInterface
} while ($composedTokenIterator->currentPosition() < $tokenCount - 1);
return $openBracketCount === $closeBracketCount;
}
private function createSpacelessPhpDocTagNode(string $tagName, GenericTagValueNode $genericTagValueNode, string $fullyQualifiedAnnotationClass) : SpacelessPhpDocTagNode
private function createSpacelessPhpDocTagNode(string $tagName, GenericTagValueNode $genericTagValueNode, string $fullyQualifiedAnnotationClass, Node $currentPhpNode) : SpacelessPhpDocTagNode
{
$formerStartEnd = $genericTagValueNode->getAttribute(PhpDocAttributeKey::START_AND_END);
return $this->createDoctrineSpacelessPhpDocTagNode($genericTagValueNode->value, $tagName, $fullyQualifiedAnnotationClass, $formerStartEnd);
return $this->createDoctrineSpacelessPhpDocTagNode($genericTagValueNode->value, $tagName, $fullyQualifiedAnnotationClass, $formerStartEnd, $currentPhpNode);
}
private function createDoctrineSpacelessPhpDocTagNode(string $annotationContent, string $tagName, string $fullyQualifiedAnnotationClass, StartAndEnd $startAndEnd) : SpacelessPhpDocTagNode
private function createDoctrineSpacelessPhpDocTagNode(string $annotationContent, string $tagName, string $fullyQualifiedAnnotationClass, StartAndEnd $startAndEnd, Node $currentPhpNode) : SpacelessPhpDocTagNode
{
$nestedTokenIterator = $this->tokenIteratorFactory->create($annotationContent);
// mimics doctrine behavior just in phpdoc-parser syntax :)
// https://github.com/doctrine/annotations/blob/c66f06b7c83e9a2a7523351a9d5a4b55f885e574/lib/Doctrine/Common/Annotations/DocParser.php#L742
$values = $this->staticDoctrineAnnotationParser->resolveAnnotationMethodCall($nestedTokenIterator);
$values = $this->staticDoctrineAnnotationParser->resolveAnnotationMethodCall($nestedTokenIterator, $currentPhpNode);
$identifierTypeNode = new IdentifierTypeNode($tagName);
$identifierTypeNode->setAttribute(PhpDocAttributeKey::RESOLVED_CLASS, $fullyQualifiedAnnotationClass);
$doctrineAnnotationTagValueNode = new DoctrineAnnotationTagValueNode($identifierTypeNode, $annotationContent, $values, SilentKeyMap::CLASS_NAMES_TO_SILENT_KEYS[$fullyQualifiedAnnotationClass] ?? null);
@ -216,7 +216,7 @@ final class DoctrineAnnotationDecorator implements PhpDocNodeDecoratorInterface
$nextStartAndEnd = $endPhpDocChildNode->getAttribute(PhpDocAttributeKey::START_AND_END);
return new StartAndEnd($currentStartAndEnd->getStart(), $nextStartAndEnd->getEnd());
}
private function resolveFqnAnnotationSpacelessPhpDocTagNode(PhpDocTextNode $phpDocTextNode) : ?SpacelessPhpDocTagNode
private function resolveFqnAnnotationSpacelessPhpDocTagNode(PhpDocTextNode $phpDocTextNode, Node $currentPhpNode) : ?SpacelessPhpDocTagNode
{
$match = Strings::match($phpDocTextNode->text, self::LONG_ANNOTATION_REGEX);
$fullyQualifiedAnnotationClass = $match['class_name'] ?? null;
@ -226,6 +226,6 @@ final class DoctrineAnnotationDecorator implements PhpDocNodeDecoratorInterface
$annotationContent = $match['annotation_content'] ?? null;
$tagName = '@\\' . $fullyQualifiedAnnotationClass;
$formerStartEnd = $phpDocTextNode->getAttribute(PhpDocAttributeKey::START_AND_END);
return $this->createDoctrineSpacelessPhpDocTagNode($annotationContent, $tagName, $fullyQualifiedAnnotationClass, $formerStartEnd);
return $this->createDoctrineSpacelessPhpDocTagNode($annotationContent, $tagName, $fullyQualifiedAnnotationClass, $formerStartEnd, $currentPhpNode);
}
}

25
packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php
View File

@ -3,6 +3,7 @@
declare (strict_types=1);
namespace Rector\BetterPhpDocParser\PhpDocParser;
use PhpParser\Node;
use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNode;
use PHPStan\PhpDocParser\Lexer\Lexer;
use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode;
@ -38,7 +39,7 @@ final class StaticDoctrineAnnotationParser
*
* @return ArrayItemNode[]
*/
public function resolveAnnotationMethodCall(BetterTokenIterator $tokenIterator) : array
public function resolveAnnotationMethodCall(BetterTokenIterator $tokenIterator, Node $currentPhpNode) : array
{
if (!$tokenIterator->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
return [];
@ -48,28 +49,28 @@ final class StaticDoctrineAnnotationParser
if ($tokenIterator->isCurrentTokenType(Lexer::TOKEN_CLOSE_PARENTHESES)) {
return [];
}
return $this->resolveAnnotationValues($tokenIterator);
return $this->resolveAnnotationValues($tokenIterator, $currentPhpNode);
}
/**
* @api tests
* @see https://github.com/doctrine/annotations/blob/c66f06b7c83e9a2a7523351a9d5a4b55f885e574/lib/Doctrine/Common/Annotations/DocParser.php#L1215-L1224
* @return CurlyListNode|string|array<mixed>|ConstExprNode|DoctrineAnnotationTagValueNode|StringNode
*/
public function resolveAnnotationValue(BetterTokenIterator $tokenIterator)
public function resolveAnnotationValue(BetterTokenIterator $tokenIterator, Node $currentPhpNode)
{
// skips dummy tokens like newlines
$tokenIterator->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
// no assign
if (!$tokenIterator->isNextTokenType(Lexer::TOKEN_EQUAL)) {
// 1. plain value - mimics https://github.com/doctrine/annotations/blob/0cb0cd2950a5c6cdbf22adbe2bfd5fd1ea68588f/lib/Doctrine/Common/Annotations/DocParser.php#L1234-L1282
return $this->parseValue($tokenIterator);
return $this->parseValue($tokenIterator, $currentPhpNode);
}
// 2. assign key = value - mimics FieldAssignment() https://github.com/doctrine/annotations/blob/0cb0cd2950a5c6cdbf22adbe2bfd5fd1ea68588f/lib/Doctrine/Common/Annotations/DocParser.php#L1291-L1303
/** @var int $key */
$key = $this->parseValue($tokenIterator);
$key = $this->parseValue($tokenIterator, $currentPhpNode);
$tokenIterator->consumeTokenType(Lexer::TOKEN_EQUAL);
// mimics https://github.com/doctrine/annotations/blob/1.13.x/lib/Doctrine/Common/Annotations/DocParser.php#L1236-L1238
$value = $this->parseValue($tokenIterator);
$value = $this->parseValue($tokenIterator, $currentPhpNode);
return [
// plain token value
$key => $value,
@ -80,10 +81,10 @@ final class StaticDoctrineAnnotationParser
*
* @return ArrayItemNode[]
*/
private function resolveAnnotationValues(BetterTokenIterator $tokenIterator) : array
private function resolveAnnotationValues(BetterTokenIterator $tokenIterator, Node $currentPhpNode) : array
{
$values = [];
$resolvedValue = $this->resolveAnnotationValue($tokenIterator);
$resolvedValue = $this->resolveAnnotationValue($tokenIterator, $currentPhpNode);
if (\is_array($resolvedValue)) {
$values = \array_merge($values, $resolvedValue);
} else {
@ -95,7 +96,7 @@ final class StaticDoctrineAnnotationParser
if ($tokenIterator->isNextTokenType(Lexer::TOKEN_CLOSE_PARENTHESES)) {
continue;
}
$nestedValues = $this->resolveAnnotationValue($tokenIterator);
$nestedValues = $this->resolveAnnotationValue($tokenIterator, $currentPhpNode);
if (\is_array($nestedValues)) {
$values = \array_merge($values, $nestedValues);
} else {
@ -110,12 +111,12 @@ final class StaticDoctrineAnnotationParser
/**
* @return CurlyListNode|string|array<mixed>|ConstExprNode|DoctrineAnnotationTagValueNode|StringNode
*/
private function parseValue(BetterTokenIterator $tokenIterator)
private function parseValue(BetterTokenIterator $tokenIterator, Node $currentPhpNode)
{
if ($tokenIterator->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET)) {
$items = $this->arrayParser->parseCurlyArray($tokenIterator);
$items = $this->arrayParser->parseCurlyArray($tokenIterator, $currentPhpNode);
return new CurlyListNode($items);
}
return $this->plainValueParser->parseValue($tokenIterator);
return $this->plainValueParser->parseValue($tokenIterator, $currentPhpNode);
}
}

17
packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/ArrayParser.php
View File

@ -3,6 +3,7 @@
declare (strict_types=1);
namespace Rector\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser;
use PhpParser\Node;
use PhpParser\Node\Scalar\String_;
use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
use PHPStan\PhpDocParser\Lexer\Lexer;
@ -28,7 +29,7 @@ final class ArrayParser
*
* @return ArrayItemNode[]
*/
public function parseCurlyArray(BetterTokenIterator $tokenIterator) : array
public function parseCurlyArray(BetterTokenIterator $tokenIterator, Node $currentPhpNode) : array
{
$values = [];
// nothing
@ -42,7 +43,7 @@ final class ArrayParser
return [];
}
// first item
$values[] = $this->resolveArrayItem($tokenIterator);
$values[] = $this->resolveArrayItem($tokenIterator, $currentPhpNode);
// 2nd+ item
while ($tokenIterator->isCurrentTokenType(Lexer::TOKEN_COMMA)) {
// optional trailing comma
@ -51,7 +52,7 @@ final class ArrayParser
if ($tokenIterator->isCurrentTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET)) {
break;
}
$values[] = $this->resolveArrayItem($tokenIterator);
$values[] = $this->resolveArrayItem($tokenIterator, $currentPhpNode);
if ($tokenIterator->isNextTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET)) {
break;
}
@ -92,7 +93,7 @@ final class ArrayParser
* Mimics https://github.com/doctrine/annotations/blob/c66f06b7c83e9a2a7523351a9d5a4b55f885e574/lib/Doctrine/Common/Annotations/DocParser.php#L1354-L1385
* @return array<null|mixed, mixed>
*/
private function resolveArrayItem(BetterTokenIterator $tokenIterator) : array
private function resolveArrayItem(BetterTokenIterator $tokenIterator, Node $currentPhpNode) : array
{
// skip newlines
$tokenIterator->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
@ -117,17 +118,17 @@ final class ArrayParser
$tokenIterator->tryConsumeTokenType(Lexer::TOKEN_COLON);
if ($key === null) {
if ($tokenIterator->isNextTokenType(Lexer::TOKEN_IDENTIFIER)) {
$key = $this->plainValueParser->parseValue($tokenIterator);
$key = $this->plainValueParser->parseValue($tokenIterator, $currentPhpNode);
} else {
$tokenIterator->tryConsumeTokenType(Lexer::TOKEN_COMMA);
$key = $this->plainValueParser->parseValue($tokenIterator);
$key = $this->plainValueParser->parseValue($tokenIterator, $currentPhpNode);
}
}
$tokenIterator->tryConsumeTokenType(Lexer::TOKEN_EQUAL);
$tokenIterator->tryConsumeTokenType(Lexer::TOKEN_COLON);
return [$key, $this->plainValueParser->parseValue($tokenIterator)];
return [$key, $this->plainValueParser->parseValue($tokenIterator, $currentPhpNode)];
}
return [$key, $this->plainValueParser->parseValue($tokenIterator)];
return [$key, $this->plainValueParser->parseValue($tokenIterator, $currentPhpNode)];
}
/**
* @return String_::KIND_SINGLE_QUOTED|String_::KIND_DOUBLE_QUOTED|null

26
packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php
View File

@ -16,8 +16,6 @@ use Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher;
use Rector\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser;
use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\Core\Configuration\CurrentNodeProvider;
use Rector\Core\Exception\ShouldNotHappenException;
final class PlainValueParser
{
/**
@ -25,11 +23,6 @@ final class PlainValueParser
* @var \Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher
*/
private $classAnnotationMatcher;
/**
* @readonly
* @var \Rector\Core\Configuration\CurrentNodeProvider
*/
private $currentNodeProvider;
/**
* @var \Rector\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser
*/
@ -38,10 +31,9 @@ final class PlainValueParser
* @var \Rector\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser\ArrayParser
*/
private $arrayParser;
public function __construct(ClassAnnotationMatcher $classAnnotationMatcher, CurrentNodeProvider $currentNodeProvider)
public function __construct(ClassAnnotationMatcher $classAnnotationMatcher)
{
$this->classAnnotationMatcher = $classAnnotationMatcher;
$this->currentNodeProvider = $currentNodeProvider;
}
public function autowire(StaticDoctrineAnnotationParser $staticDoctrineAnnotationParser, \Rector\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser\ArrayParser $arrayParser) : void
{
@ -51,7 +43,7 @@ final class PlainValueParser
/**
* @return string|mixed[]|ConstExprNode|DoctrineAnnotationTagValueNode|StringNode
*/
public function parseValue(BetterTokenIterator $tokenIterator)
public function parseValue(BetterTokenIterator $tokenIterator, Node $currentPhpNode)
{
$currentTokenValue = $tokenIterator->currentTokenValue();
// temporary hackaround multi-line doctrine annotations
@ -61,7 +53,7 @@ final class PlainValueParser
// consume the token
$isOpenCurlyArray = $tokenIterator->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET);
if ($isOpenCurlyArray) {
return $this->arrayParser->parseCurlyArray($tokenIterator);
return $this->arrayParser->parseCurlyArray($tokenIterator, $currentPhpNode);
}
$tokenIterator->next();
// normalize value
@ -75,7 +67,7 @@ final class PlainValueParser
}
// nested entity!, supported in attribute since PHP 8.1
if ($tokenIterator->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
return $this->parseNestedDoctrineAnnotationTagValueNode($currentTokenValue, $tokenIterator);
return $this->parseNestedDoctrineAnnotationTagValueNode($currentTokenValue, $tokenIterator, $currentPhpNode);
}
$start = $tokenIterator->currentPosition();
// from "quote to quote"
@ -90,16 +82,12 @@ final class PlainValueParser
}
return $currentTokenValue;
}
private function parseNestedDoctrineAnnotationTagValueNode(string $currentTokenValue, BetterTokenIterator $tokenIterator) : DoctrineAnnotationTagValueNode
private function parseNestedDoctrineAnnotationTagValueNode(string $currentTokenValue, BetterTokenIterator $tokenIterator, Node $currentPhpNode) : DoctrineAnnotationTagValueNode
{
// @todo
$annotationShortName = $currentTokenValue;
$values = $this->staticDoctrineAnnotationParser->resolveAnnotationMethodCall($tokenIterator);
$currentNode = $this->currentNodeProvider->getNode();
if (!$currentNode instanceof Node) {
throw new ShouldNotHappenException();
}
$fullyQualifiedAnnotationClass = $this->classAnnotationMatcher->resolveTagFullyQualifiedName($annotationShortName, $currentNode);
$values = $this->staticDoctrineAnnotationParser->resolveAnnotationMethodCall($tokenIterator, $currentPhpNode);
$fullyQualifiedAnnotationClass = $this->classAnnotationMatcher->resolveTagFullyQualifiedName($annotationShortName, $currentPhpNode);
// keep the last ")"
$tokenIterator->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
if ($tokenIterator->currentTokenValue() === ')') {

4
packages/NodeTypeResolver/PhpDoc/NodeAnalyzer/DocBlockClassRenamer.php
View File

@ -3,6 +3,7 @@
declare (strict_types=1);
namespace Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer;
use PhpParser\Node;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\NodeTypeResolver\PhpDocNodeVisitor\ClassRenamePhpDocNodeVisitor;
use Rector\NodeTypeResolver\ValueObject\OldToNewType;
@ -21,13 +22,14 @@ final class DocBlockClassRenamer
/**
* @param OldToNewType[] $oldToNewTypes
*/
public function renamePhpDocType(PhpDocInfo $phpDocInfo, array $oldToNewTypes) : bool
public function renamePhpDocType(PhpDocInfo $phpDocInfo, array $oldToNewTypes, Node $currentPhpNode) : bool
{
if ($oldToNewTypes === []) {
return \false;
}
$phpDocNodeTraverser = new PhpDocNodeTraverser();
$phpDocNodeTraverser->addPhpDocNodeVisitor($this->classRenamePhpDocNodeVisitor);
$this->classRenamePhpDocNodeVisitor->setCurrentPhpNode($currentPhpNode);
$this->classRenamePhpDocNodeVisitor->setOldToNewTypes($oldToNewTypes);
$phpDocNodeTraverser->traverse($phpDocInfo->getPhpDocNode());
return $this->classRenamePhpDocNodeVisitor->hasChanged();

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

@ -3,7 +3,7 @@
declare (strict_types=1);
namespace Rector\NodeTypeResolver\PhpDocNodeVisitor;
use PhpParser\Node as PhpParserNode;
use PhpParser\Node as PhpNode;
use PhpParser\Node\Identifier;
use PhpParser\Node\Stmt\GroupUse;
use PhpParser\Node\Stmt\Use_;
@ -14,7 +14,6 @@ use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use PHPStan\Type\ObjectType;
use PHPStan\Type\Type;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\Core\Configuration\CurrentNodeProvider;
use Rector\Core\Configuration\Option;
use Rector\Core\Configuration\Parameter\SimpleParameterProvider;
use Rector\Core\Exception\ShouldNotHappenException;
@ -31,11 +30,6 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
* @var \Rector\StaticTypeMapper\StaticTypeMapper
*/
private $staticTypeMapper;
/**
* @readonly
* @var \Rector\Core\Configuration\CurrentNodeProvider
*/
private $currentNodeProvider;
/**
* @readonly
* @var \Rector\Naming\Naming\UseImportsResolver
@ -49,17 +43,27 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
* @var bool
*/
private $hasChanged = \false;
public function __construct(StaticTypeMapper $staticTypeMapper, CurrentNodeProvider $currentNodeProvider, UseImportsResolver $useImportsResolver)
/**
* @var PhpNode|null
*/
private $currentPhpNode;
public function __construct(StaticTypeMapper $staticTypeMapper, UseImportsResolver $useImportsResolver)
{
$this->staticTypeMapper = $staticTypeMapper;
$this->currentNodeProvider = $currentNodeProvider;
$this->useImportsResolver = $useImportsResolver;
}
public function setCurrentPhpNode(PhpNode $phpNode) : void
{
$this->currentPhpNode = $phpNode;
}
public function beforeTraverse(Node $node) : void
{
if ($this->oldToNewTypes === []) {
throw new ShouldNotHappenException('Configure "$oldToNewClasses" first');
}
if (!$this->currentPhpNode instanceof PhpNode) {
throw new ShouldNotHappenException('Configure "$currentPhpNode" first');
}
$this->hasChanged = \false;
}
public function enterNode(Node $node) : ?Node
@ -67,17 +71,15 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
if (!$node instanceof IdentifierTypeNode) {
return null;
}
$phpParserNode = $this->currentNodeProvider->getNode();
if (!$phpParserNode instanceof PhpParserNode) {
throw new ShouldNotHappenException();
}
$virtualNode = $phpParserNode->getAttribute(AttributeKey::VIRTUAL_NODE);
/** @var \PhpParser\Node $currentPhpNode */
$currentPhpNode = $this->currentPhpNode;
$virtualNode = $currentPhpNode->getAttribute(AttributeKey::VIRTUAL_NODE);
if ($virtualNode === \true) {
return null;
}
$identifier = clone $node;
$identifier->name = $this->resolveNamespacedName($identifier, $phpParserNode, $node->name);
$staticType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($identifier, $phpParserNode);
$identifier->name = $this->resolveNamespacedName($identifier, $currentPhpNode, $node->name);
$staticType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($identifier, $currentPhpNode);
$shouldImport = SimpleParameterProvider::provideBoolParameter(Option::AUTO_IMPORT_NAMES);
$isNoNamespacedName = \strncmp($identifier->name, '\\', \strlen('\\')) !== 0 && \substr_count($identifier->name, '\\') === 0;
// tweak overlapped import + rename
@ -112,7 +114,7 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
{
return $this->hasChanged;
}
private function resolveNamespacedName(IdentifierTypeNode $identifierTypeNode, PhpParserNode $phpParserNode, string $name) : string
private function resolveNamespacedName(IdentifierTypeNode $identifierTypeNode, PhpNode $phpNode, string $name) : string
{
if (\strncmp($name, '\\', \strlen('\\')) === 0) {
return $name;
@ -120,7 +122,7 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
if (\strpos($name, '\\') !== \false) {
return $name;
}
$staticType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($identifierTypeNode, $phpParserNode);
$staticType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($identifierTypeNode, $phpNode);
if (!$staticType instanceof ObjectType) {
return $name;
}
@ -128,10 +130,10 @@ final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
return $name;
}
$uses = $this->useImportsResolver->resolve();
$originalNode = $phpParserNode->getAttribute(AttributeKey::ORIGINAL_NODE);
$scope = $originalNode instanceof PhpParserNode ? $originalNode->getAttribute(AttributeKey::SCOPE) : $phpParserNode->getAttribute(AttributeKey::SCOPE);
$originalNode = $phpNode->getAttribute(AttributeKey::ORIGINAL_NODE);
$scope = $originalNode instanceof PhpNode ? $originalNode->getAttribute(AttributeKey::SCOPE) : $phpNode->getAttribute(AttributeKey::SCOPE);
if (!$scope instanceof Scope) {
if (!$originalNode instanceof PhpParserNode) {
if (!$originalNode instanceof PhpNode) {
return $this->resolveNamefromUse($uses, $name);
}
return '';

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

@ -138,7 +138,7 @@ final class ClassRenamer
if ($node instanceof AttributeGroup) {
return \false;
}
$hasChanged = $this->docBlockClassRenamer->renamePhpDocType($phpDocInfo, $oldToNewTypes);
$hasChanged = $this->docBlockClassRenamer->renamePhpDocType($phpDocInfo, $oldToNewTypes, $node);
$hasChanged = $this->phpDocClassRenamer->changeTypeInAnnotationTypes($node, $phpDocInfo, $oldToNewClasses, $hasChanged);
if ($hasChanged) {
$this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '307b9d6c470480b8dea2bee8bcf6fbcc352bbf79';
public const PACKAGE_VERSION = 'f6063588c0107450e51333934308f71434722f68';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-09-15 09:07:07';
public const RELEASE_DATE = '2023-09-15 13:50:16';
/**
* @var int
*/

21
src/Configuration/CurrentNodeProvider.php
View File

@ -1,21 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Core\Configuration;
use PhpParser\Node;
final class CurrentNodeProvider
{
/**
* @var \PhpParser\Node|null
*/
private $node;
public function setNode(Node $node) : void
{
$this->node = $node;
}
public function getNode() : ?Node
{
return $this->node;
}
}

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit11ccd41ade9e1c2c110e4985f80f9718::getLoader();
return ComposerAutoloaderInit7a5fa66101b78d2464eaaf65abcd5e5d::getLoader();

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1155,7 +1155,6 @@ return array(
'Rector\\Core\\Bootstrap\\RectorConfigsResolver' => $baseDir . '/src/Bootstrap/RectorConfigsResolver.php',
'Rector\\Core\\Configuration\\ConfigInitializer' => $baseDir . '/src/Configuration/ConfigInitializer.php',
'Rector\\Core\\Configuration\\ConfigurationFactory' => $baseDir . '/src/Configuration/ConfigurationFactory.php',
'Rector\\Core\\Configuration\\CurrentNodeProvider' => $baseDir . '/src/Configuration/CurrentNodeProvider.php',
'Rector\\Core\\Configuration\\Option' => $baseDir . '/src/Configuration/Option.php',
'Rector\\Core\\Configuration\\Parameter\\SimpleParameterProvider' => $baseDir . '/src/Configuration/Parameter/SimpleParameterProvider.php',
'Rector\\Core\\Configuration\\RenamedClassesDataCollector' => $baseDir . '/src/Configuration/RenamedClassesDataCollector.php',

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit11ccd41ade9e1c2c110e4985f80f9718
class ComposerAutoloaderInit7a5fa66101b78d2464eaaf65abcd5e5d
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit11ccd41ade9e1c2c110e4985f80f9718
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit11ccd41ade9e1c2c110e4985f80f9718', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit7a5fa66101b78d2464eaaf65abcd5e5d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit11ccd41ade9e1c2c110e4985f80f9718', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit7a5fa66101b78d2464eaaf65abcd5e5d', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit11ccd41ade9e1c2c110e4985f80f9718::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit7a5fa66101b78d2464eaaf65abcd5e5d::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit11ccd41ade9e1c2c110e4985f80f9718::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit7a5fa66101b78d2464eaaf65abcd5e5d::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit11ccd41ade9e1c2c110e4985f80f9718
class ComposerStaticInit7a5fa66101b78d2464eaaf65abcd5e5d
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -1375,7 +1375,6 @@ class ComposerStaticInit11ccd41ade9e1c2c110e4985f80f9718
'Rector\\Core\\Bootstrap\\RectorConfigsResolver' => __DIR__ . '/../..' . '/src/Bootstrap/RectorConfigsResolver.php',
'Rector\\Core\\Configuration\\ConfigInitializer' => __DIR__ . '/../..' . '/src/Configuration/ConfigInitializer.php',
'Rector\\Core\\Configuration\\ConfigurationFactory' => __DIR__ . '/../..' . '/src/Configuration/ConfigurationFactory.php',
'Rector\\Core\\Configuration\\CurrentNodeProvider' => __DIR__ . '/../..' . '/src/Configuration/CurrentNodeProvider.php',
'Rector\\Core\\Configuration\\Option' => __DIR__ . '/../..' . '/src/Configuration/Option.php',
'Rector\\Core\\Configuration\\Parameter\\SimpleParameterProvider' => __DIR__ . '/../..' . '/src/Configuration/Parameter/SimpleParameterProvider.php',
'Rector\\Core\\Configuration\\RenamedClassesDataCollector' => __DIR__ . '/../..' . '/src/Configuration/RenamedClassesDataCollector.php',
@ -2593,9 +2592,9 @@ class ComposerStaticInit11ccd41ade9e1c2c110e4985f80f9718
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit11ccd41ade9e1c2c110e4985f80f9718::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit11ccd41ade9e1c2c110e4985f80f9718::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit11ccd41ade9e1c2c110e4985f80f9718::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit7a5fa66101b78d2464eaaf65abcd5e5d::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit7a5fa66101b78d2464eaaf65abcd5e5d::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit7a5fa66101b78d2464eaaf65abcd5e5d::$classMap;
}, null, ClassLoader::class);
}

8
vendor/composer/installed.json vendored
View File

@ -1744,12 +1744,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
"reference": "b599d7a8d207391ce74b35632a3e4a51043bc182"
"reference": "2c67f2cd122c2befd837e06eb020b2d918107263"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/b599d7a8d207391ce74b35632a3e4a51043bc182",
"reference": "b599d7a8d207391ce74b35632a3e4a51043bc182",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/2c67f2cd122c2befd837e06eb020b2d918107263",
"reference": "2c67f2cd122c2befd837e06eb020b2d918107263",
"shasum": ""
},
"require": {
@ -1774,7 +1774,7 @@
"tomasvotruba\/type-coverage": "^0.2",
"tomasvotruba\/unused-public": "^0.3"
},
"time": "2023-09-13T14:52:54+00:00",
"time": "2023-09-15T11:47:10+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {

2
vendor/composer/installed.php vendored
View File

File diff suppressed because one or more lines are too long

2
vendor/rector/extension-installer/src/GeneratedConfig.php vendored
View File

@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
*/
final class GeneratedConfig
{
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main b599d7a'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 3782784'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 2a9734a'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 09ddd39'));
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 2c67f2c'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 3782784'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 2a9734a'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 09ddd39'));
private function __construct()
{
}

2
vendor/rector/rector-doctrine/rules/CodeQuality/Rector/Property/MakeEntityDateTimePropertyDateTimeInterfaceRector.php vendored
View File

@ -110,7 +110,7 @@ CODE_SAMPLE
{
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
$oldToNewTypes = [new OldToNewType(new FullyQualifiedObjectType($oldClass), new FullyQualifiedObjectType($newClass))];
$hasChanged = $this->docBlockClassRenamer->renamePhpDocType($phpDocInfo, $oldToNewTypes);
$hasChanged = $this->docBlockClassRenamer->renamePhpDocType($phpDocInfo, $oldToNewTypes, $property);
if (!$hasChanged) {
return;
}