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 38e1f8a450

Browse Source 
38e1f8a450 Remove NamespaceNodeVisitor (#2167)
This commit is contained in:
Tomas Votruba 2022-04-25 22:12:26 +00:00
parent 6b472ba52b
commit a71b4168c5
10 changed files with 21 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/NodeTypeResolver/NodeScopeAndMetadataDecorator.php
View File

@ -9,7 +9,6 @@ use PhpParser\NodeVisitor\CloningVisitor;
use PhpParser\NodeVisitor\NodeConnectingVisitor;
use Rector\Core\ValueObject\Application\File;
use Rector\NodeTypeResolver\NodeVisitor\FunctionLikeParamArgPositionNodeVisitor;
use Rector\NodeTypeResolver\NodeVisitor\NamespaceNodeVisitor;
use Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver;
final class NodeScopeAndMetadataDecorator
{
@ -18,11 +17,6 @@ final class NodeScopeAndMetadataDecorator
* @var \PhpParser\NodeVisitor\CloningVisitor
*/
private $cloningVisitor;
/**
* @readonly
* @var \Rector\NodeTypeResolver\NodeVisitor\NamespaceNodeVisitor
*/
private $namespaceNodeVisitor;
/**
* @readonly
* @var \Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver
@ -38,10 +32,9 @@ final class NodeScopeAndMetadataDecorator
* @var \Rector\NodeTypeResolver\NodeVisitor\FunctionLikeParamArgPositionNodeVisitor
*/
private $functionLikeParamArgPositionNodeVisitor;
public function __construct(\PhpParser\NodeVisitor\CloningVisitor $cloningVisitor, \Rector\NodeTypeResolver\NodeVisitor\NamespaceNodeVisitor $namespaceNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver $phpStanNodeScopeResolver, \PhpParser\NodeVisitor\NodeConnectingVisitor $nodeConnectingVisitor, \Rector\NodeTypeResolver\NodeVisitor\FunctionLikeParamArgPositionNodeVisitor $functionLikeParamArgPositionNodeVisitor)
public function __construct(\PhpParser\NodeVisitor\CloningVisitor $cloningVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver $phpStanNodeScopeResolver, \PhpParser\NodeVisitor\NodeConnectingVisitor $nodeConnectingVisitor, \Rector\NodeTypeResolver\NodeVisitor\FunctionLikeParamArgPositionNodeVisitor $functionLikeParamArgPositionNodeVisitor)
{
$this->cloningVisitor = $cloningVisitor;
$this->namespaceNodeVisitor = $namespaceNodeVisitor;
$this->phpStanNodeScopeResolver = $phpStanNodeScopeResolver;
$this->nodeConnectingVisitor = $nodeConnectingVisitor;
$this->functionLikeParamArgPositionNodeVisitor = $functionLikeParamArgPositionNodeVisitor;
@ -59,7 +52,6 @@ final class NodeScopeAndMetadataDecorator
$nodeTraverser->addVisitor($this->cloningVisitor);
// this one has to be run again to re-connect nodes with new attributes
$nodeTraverser->addVisitor($this->nodeConnectingVisitor);
$nodeTraverser->addVisitor($this->namespaceNodeVisitor);
$nodeTraverser->addVisitor($this->functionLikeParamArgPositionNodeVisitor);
return $nodeTraverser->traverse($stmts);
}

49
packages/NodeTypeResolver/NodeVisitor/NamespaceNodeVisitor.php
View File

@ -1,49 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\NodeTypeResolver\NodeVisitor;
use PhpParser\Node;
use PhpParser\Node\Stmt\Namespace_;
use PhpParser\Node\Stmt\Use_;
use PhpParser\NodeVisitorAbstract;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeTypeResolver\Node\AttributeKey;
final class NamespaceNodeVisitor extends \PhpParser\NodeVisitorAbstract
{
/**
* @var Use_[]
*/
private $useNodes = [];
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(\Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder)
{
$this->betterNodeFinder = $betterNodeFinder;
}
/**
* @param Node[] $nodes
* @return Node[]|null
*/
public function beforeTraverse(array $nodes) : ?array
{
// init basic use nodes for non-namespaced code
/** @var Use_[] $uses */
$uses = $this->betterNodeFinder->findInstanceOf($nodes, \PhpParser\Node\Stmt\Use_::class);
$this->useNodes = $uses;
return null;
}
public function enterNode(\PhpParser\Node $node) : ?\PhpParser\Node
{
if ($node instanceof \PhpParser\Node\Stmt\Namespace_) {
/** @var Use_[] $uses */
$uses = $this->betterNodeFinder->findInstanceOf($node, \PhpParser\Node\Stmt\Use_::class);
$this->useNodes = $uses;
}
$node->setAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::USE_NODES, $this->useNodes);
return $node;
}
}

1
rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector.php
View File

@ -125,7 +125,6 @@ CODE_SAMPLE
}
/** @var PropertyFetch|StaticPropertyFetch $expr */
$variableType = $expr instanceof \PhpParser\Node\Expr\PropertyFetch ? $this->nodeTypeResolver->getType($expr->var) : $this->nodeTypeResolver->getType($expr->class);
// dump($variableType);die;
if ($variableType instanceof \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType) {
$currentClassLike = $this->betterNodeFinder->findParentType($expr, \PhpParser\Node\Stmt\ClassLike::class);
if ($currentClassLike instanceof \PhpParser\Node\Stmt\ClassLike) {

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '88cfff17bad60a6538d5d246389a4641b95347f8';
public const PACKAGE_VERSION = '38e1f8a45082086aca4b26b811a1f467f6349f6c';
/**
* @var string
*/
public const RELEASE_DATE = '2022-04-26 02:13:53';
public const RELEASE_DATE = '2022-04-26 00:04:26';
/**
* @var string
*/

2
src/Rector/AbstractRector.php
View File

@ -46,7 +46,7 @@ abstract class AbstractRector extends \PhpParser\NodeVisitorAbstract implements
/**
* @var string[]
*/
private const ATTRIBUTES_TO_MIRROR = [\Rector\NodeTypeResolver\Node\AttributeKey::USE_NODES, \Rector\NodeTypeResolver\Node\AttributeKey::SCOPE, \Rector\NodeTypeResolver\Node\AttributeKey::RESOLVED_NAME, \Rector\NodeTypeResolver\Node\AttributeKey::PARENT_NODE];
private const ATTRIBUTES_TO_MIRROR = [\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE, \Rector\NodeTypeResolver\Node\AttributeKey::RESOLVED_NAME, \Rector\NodeTypeResolver\Node\AttributeKey::PARENT_NODE];
/**
* @var string
*/

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -2389,7 +2389,6 @@ return array(
'Rector\\NodeTypeResolver\\NodeTypeResolver\\TraitTypeResolver' => $baseDir . '/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeTypeResolver\\VariableTypeResolver' => $baseDir . '/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\FunctionLikeParamArgPositionNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/NodeVisitor/FunctionLikeParamArgPositionNodeVisitor.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\NamespaceNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/NodeVisitor/NamespaceNodeVisitor.php',
'Rector\\NodeTypeResolver\\Node\\AttributeKey' => $baseDir . '/packages/NodeTypeResolver/Node/AttributeKey.php',
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\RemoveDeepChainMethodCallNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/RemoveDeepChainMethodCallNodeVisitor.php',
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\PHPStanNodeScopeResolver' => $baseDir . '/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitd23ae60ac18499bb6de1afaea4b106a5
class ComposerAutoloaderInitbcdaeabab37a18d9a0720998e454d54d
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInitd23ae60ac18499bb6de1afaea4b106a5
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitd23ae60ac18499bb6de1afaea4b106a5', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitbcdaeabab37a18d9a0720998e454d54d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitd23ae60ac18499bb6de1afaea4b106a5', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitbcdaeabab37a18d9a0720998e454d54d', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitd23ae60ac18499bb6de1afaea4b106a5::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitbcdaeabab37a18d9a0720998e454d54d::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInitd23ae60ac18499bb6de1afaea4b106a5::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitbcdaeabab37a18d9a0720998e454d54d::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequired23ae60ac18499bb6de1afaea4b106a5($fileIdentifier, $file);
composerRequirebcdaeabab37a18d9a0720998e454d54d($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInitd23ae60ac18499bb6de1afaea4b106a5
* @param string $file
* @return void
*/
function composerRequired23ae60ac18499bb6de1afaea4b106a5($fileIdentifier, $file)
function composerRequirebcdaeabab37a18d9a0720998e454d54d($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 ComposerStaticInitd23ae60ac18499bb6de1afaea4b106a5
class ComposerStaticInitbcdaeabab37a18d9a0720998e454d54d
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -2758,7 +2758,6 @@ class ComposerStaticInitd23ae60ac18499bb6de1afaea4b106a5
'Rector\\NodeTypeResolver\\NodeTypeResolver\\TraitTypeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeTypeResolver\\VariableTypeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\FunctionLikeParamArgPositionNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeVisitor/FunctionLikeParamArgPositionNodeVisitor.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\NamespaceNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeVisitor/NamespaceNodeVisitor.php',
'Rector\\NodeTypeResolver\\Node\\AttributeKey' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/Node/AttributeKey.php',
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\RemoveDeepChainMethodCallNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/RemoveDeepChainMethodCallNodeVisitor.php',
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\PHPStanNodeScopeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php',
@ -3872,9 +3871,9 @@ class ComposerStaticInitd23ae60ac18499bb6de1afaea4b106a5
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitd23ae60ac18499bb6de1afaea4b106a5::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd23ae60ac18499bb6de1afaea4b106a5::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd23ae60ac18499bb6de1afaea4b106a5::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitbcdaeabab37a18d9a0720998e454d54d::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitbcdaeabab37a18d9a0720998e454d54d::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitbcdaeabab37a18d9a0720998e454d54d::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20220425\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitd23ae60ac18499bb6de1afaea4b106a5', false) && !interface_exists('ComposerAutoloaderInitd23ae60ac18499bb6de1afaea4b106a5', false) && !trait_exists('ComposerAutoloaderInitd23ae60ac18499bb6de1afaea4b106a5', false)) {
spl_autoload_call('RectorPrefix20220425\ComposerAutoloaderInitd23ae60ac18499bb6de1afaea4b106a5');
if (!class_exists('ComposerAutoloaderInitbcdaeabab37a18d9a0720998e454d54d', false) && !interface_exists('ComposerAutoloaderInitbcdaeabab37a18d9a0720998e454d54d', false) && !trait_exists('ComposerAutoloaderInitbcdaeabab37a18d9a0720998e454d54d', false)) {
spl_autoload_call('RectorPrefix20220425\ComposerAutoloaderInitbcdaeabab37a18d9a0720998e454d54d');
}
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('RectorPrefix20220425\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220425\print_node(...func_get_args());
}
}
if (!function_exists('composerRequired23ae60ac18499bb6de1afaea4b106a5')) {
function composerRequired23ae60ac18499bb6de1afaea4b106a5() {
return \RectorPrefix20220425\composerRequired23ae60ac18499bb6de1afaea4b106a5(...func_get_args());
if (!function_exists('composerRequirebcdaeabab37a18d9a0720998e454d54d')) {
function composerRequirebcdaeabab37a18d9a0720998e454d54d() {
return \RectorPrefix20220425\composerRequirebcdaeabab37a18d9a0720998e454d54d(...func_get_args());
}
}
if (!function_exists('scanPath')) {