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

Updated Rector to commit 0bb2398438d57d393d7be0d3f7fc2d237cf51e0a

Browse Source 
0bb2398438 Make BetterPhpDocParser parse node directly (#4981)
This commit is contained in:
Tomas Votruba 2023-09-11 07:45:38 +00:00
parent 553b67b890
commit 59ce553896
8 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ final class PhpDocInfoFactory
} else {
$tokens = $this->lexer->tokenize($docComment->getText());
$tokenIterator = new BetterTokenIterator($tokens);
$phpDocNode = $this->betterPhpDocParser->parse($tokenIterator);
$phpDocNode = $this->betterPhpDocParser->parseWithNode($tokenIterator, $node);
$this->setPositionOfLastToken($phpDocNode);
}
$phpDocInfo = $this->createFromPhpDocNode($phpDocNode, $tokenIterator, $node);

30
packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php
View File

@ -19,7 +19,6 @@ use Rector\BetterPhpDocParser\PhpDocInfo\TokenIteratorFactory;
use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
use Rector\Core\Configuration\CurrentNodeProvider;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\Util\Reflection\PrivatesAccessor;
/**
@ -27,11 +26,6 @@ use Rector\Core\Util\Reflection\PrivatesAccessor;
*/
final class BetterPhpDocParser extends PhpDocParser
{
/**
* @readonly
* @var \Rector\Core\Configuration\CurrentNodeProvider
*/
private $currentNodeProvider;
/**
* @readonly
* @var \Rector\BetterPhpDocParser\PhpDocInfo\TokenIteratorFactory
@ -50,10 +44,9 @@ final class BetterPhpDocParser extends PhpDocParser
/**
* @param PhpDocNodeDecoratorInterface[] $phpDocNodeDecorators
*/
public function __construct(TypeParser $typeParser, ConstExprParser $constExprParser, CurrentNodeProvider $currentNodeProvider, TokenIteratorFactory $tokenIteratorFactory, array $phpDocNodeDecorators, PrivatesAccessor $privatesAccessor = null)
public function __construct(TypeParser $typeParser, ConstExprParser $constExprParser, TokenIteratorFactory $tokenIteratorFactory, array $phpDocNodeDecorators, PrivatesAccessor $privatesAccessor = null)
{
$privatesAccessor = $privatesAccessor ?? new PrivatesAccessor();
$this->currentNodeProvider = $currentNodeProvider;
$this->tokenIteratorFactory = $tokenIteratorFactory;
$this->phpDocNodeDecorators = $phpDocNodeDecorators;
$this->privatesAccessor = $privatesAccessor;
@ -74,25 +67,20 @@ final class BetterPhpDocParser extends PhpDocParser
\true
);
}
public function parse(TokenIterator $tokenIterator) : PhpDocNode
public function parseWithNode(BetterTokenIterator $betterTokenIterator, Node $node) : PhpDocNode
{
$tokenIterator->consumeTokenType(Lexer::TOKEN_OPEN_PHPDOC);
$tokenIterator->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
$betterTokenIterator->consumeTokenType(Lexer::TOKEN_OPEN_PHPDOC);
$betterTokenIterator->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
$children = [];
if (!$tokenIterator->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) {
$children[] = $this->parseChildAndStoreItsPositions($tokenIterator);
while ($tokenIterator->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL) && !$tokenIterator->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) {
$children[] = $this->parseChildAndStoreItsPositions($tokenIterator);
if (!$betterTokenIterator->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) {
$children[] = $this->parseChildAndStoreItsPositions($betterTokenIterator);
while ($betterTokenIterator->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL) && !$betterTokenIterator->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) {
$children[] = $this->parseChildAndStoreItsPositions($betterTokenIterator);
}
}
// might be in the middle of annotations
$tokenIterator->tryConsumeTokenType(Lexer::TOKEN_CLOSE_PHPDOC);
$betterTokenIterator->tryConsumeTokenType(Lexer::TOKEN_CLOSE_PHPDOC);
$phpDocNode = new PhpDocNode($children);
// decorate FQN classes etc.
$node = $this->currentNodeProvider->getNode();
if (!$node instanceof Node) {
throw new ShouldNotHappenException();
}
foreach ($this->phpDocNodeDecorators as $phpDocNodeDecorator) {
$phpDocNodeDecorator->decorate($phpDocNode, $node);
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '57ec646b63b0c7804df44fd67990b41d83d56c40';
public const PACKAGE_VERSION = '0bb2398438d57d393d7be0d3f7fc2d237cf51e0a';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-09-11 07:33:42';
public const RELEASE_DATE = '2023-09-11 09:41:39';
/**
* @var int
*/

3
src/DependencyInjection/LazyContainerFactory.php
View File

@ -47,7 +47,6 @@ use Rector\Config\RectorConfig;
use Rector\Core\Application\ChangedNodeScopeRefresher;
use Rector\Core\Application\FileProcessor;
use Rector\Core\Configuration\ConfigInitializer;
use Rector\Core\Configuration\CurrentNodeProvider;
use Rector\Core\Configuration\RenamedClassesDataCollector;
use Rector\Core\Console\Command\ListRulesCommand;
use Rector\Core\Console\Command\ProcessCommand;
@ -297,7 +296,7 @@ final class LazyContainerFactory
// node name resolvers
$rectorConfig->when(NodeNameResolver::class)->needs('$nodeNameResolvers')->giveTagged(NodeNameResolverInterface::class);
$rectorConfig->afterResolving(AbstractRector::class, static function (AbstractRector $rector, Container $container) : void {
$rector->autowire($container->make(NodeNameResolver::class), $container->make(NodeTypeResolver::class), $container->make(SimpleCallableNodeTraverser::class), $container->make(NodeFactory::class), $container->make(PhpDocInfoFactory::class), $container->make(StaticTypeMapper::class), $container->make(CurrentRectorProvider::class), $container->make(CurrentNodeProvider::class), $container->make(Skipper::class), $container->make(ValueResolver::class), $container->make(BetterNodeFinder::class), $container->make(NodeComparator::class), $container->make(CurrentFileProvider::class), $container->make(CreatedByRuleDecorator::class), $container->make(ChangedNodeScopeRefresher::class));
$rector->autowire($container->make(NodeNameResolver::class), $container->make(NodeTypeResolver::class), $container->make(SimpleCallableNodeTraverser::class), $container->make(NodeFactory::class), $container->make(PhpDocInfoFactory::class), $container->make(StaticTypeMapper::class), $container->make(CurrentRectorProvider::class), $container->make(Skipper::class), $container->make(ValueResolver::class), $container->make(BetterNodeFinder::class), $container->make(NodeComparator::class), $container->make(CurrentFileProvider::class), $container->make(CreatedByRuleDecorator::class), $container->make(ChangedNodeScopeRefresher::class));
});
$this->registerTagged($rectorConfig, self::PHP_PARSER_NODE_MAPPER_CLASSES, PhpParserNodeMapperInterface::class);
$this->registerTagged($rectorConfig, self::PHP_DOC_NODE_DECORATOR_CLASSES, PhpDocNodeDecoratorInterface::class);

10
src/Rector/AbstractRector.php
View File

@ -14,7 +14,6 @@ use PHPStan\Type\Type;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\ChangesReporting\ValueObject\RectorWithLineChange;
use Rector\Core\Application\ChangedNodeScopeRefresher;
use Rector\Core\Configuration\CurrentNodeProvider;
use Rector\Core\Contract\Rector\RectorInterface;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\Logging\CurrentRectorProvider;
@ -95,10 +94,6 @@ CODE_SAMPLE;
* @var \Rector\Core\Logging\CurrentRectorProvider
*/
private $currentRectorProvider;
/**
* @var \Rector\Core\Configuration\CurrentNodeProvider
*/
private $currentNodeProvider;
/**
* @var \Rector\Skipper\Skipper\Skipper
*/
@ -119,7 +114,7 @@ CODE_SAMPLE;
* @var int|null
*/
private $toBeRemovedNodeId;
public function autowire(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeFactory $nodeFactory, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, CurrentRectorProvider $currentRectorProvider, CurrentNodeProvider $currentNodeProvider, Skipper $skipper, ValueResolver $valueResolver, BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator, CurrentFileProvider $currentFileProvider, CreatedByRuleDecorator $createdByRuleDecorator, ChangedNodeScopeRefresher $changedNodeScopeRefresher) : void
public function autowire(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeFactory $nodeFactory, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, CurrentRectorProvider $currentRectorProvider, Skipper $skipper, ValueResolver $valueResolver, BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator, CurrentFileProvider $currentFileProvider, CreatedByRuleDecorator $createdByRuleDecorator, ChangedNodeScopeRefresher $changedNodeScopeRefresher) : void
{
$this->nodeNameResolver = $nodeNameResolver;
$this->nodeTypeResolver = $nodeTypeResolver;
@ -128,7 +123,6 @@ CODE_SAMPLE;
$this->phpDocInfoFactory = $phpDocInfoFactory;
$this->staticTypeMapper = $staticTypeMapper;
$this->currentRectorProvider = $currentRectorProvider;
$this->currentNodeProvider = $currentNodeProvider;
$this->skipper = $skipper;
$this->valueResolver = $valueResolver;
$this->betterNodeFinder = $betterNodeFinder;
@ -163,8 +157,6 @@ CODE_SAMPLE;
return null;
}
$this->currentRectorProvider->changeCurrentRector($this);
// for PHP doc info factory and change notifier
$this->currentNodeProvider->setNode($node);
$this->changedNodeScopeRefresher->reIndexNodeAttributes($node);
// ensure origNode pulled before refactor to avoid changed during refactor, ref https://3v4l.org/YMEGN
$originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE) ?? $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 ComposerAutoloaderInit2869eca86dbdc2f5b27200462c810b76::getLoader();
return ComposerAutoloaderInit97f1607b3134c94f56f4c959cc89264f::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit2869eca86dbdc2f5b27200462c810b76
class ComposerStaticInit97f1607b3134c94f56f4c959cc89264f
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2596,9 +2596,9 @@ class ComposerStaticInit2869eca86dbdc2f5b27200462c810b76
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit2869eca86dbdc2f5b27200462c810b76::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit2869eca86dbdc2f5b27200462c810b76::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit2869eca86dbdc2f5b27200462c810b76::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit97f1607b3134c94f56f4c959cc89264f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit97f1607b3134c94f56f4c959cc89264f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit97f1607b3134c94f56f4c959cc89264f::$classMap;
}, null, ClassLoader::class);
}