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

Updated Rector to commit b3ea98f636dc6f965589eaf5fcf6dcda6e38cd9b

Browse Source 
b3ea98f636 [NodeTypeResolver] Make NodeTraverser as property on NodeScopeAndMetadataDecorator (#3532)
This commit is contained in:
Tomas Votruba 2023-03-28 19:24:10 +00:00
parent dc695d1925
commit 2b57174b33
5 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/NodeTypeResolver/NodeScopeAndMetadataDecorator.php
View File

@ -14,30 +14,23 @@ final class NodeScopeAndMetadataDecorator
{
/**
* @readonly
* @var \PhpParser\NodeVisitor\CloningVisitor
* @var \PhpParser\NodeTraverser
*/
private $cloningVisitor;
private $nodeTraverser;
/**
* @readonly
* @var \Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver
*/
private $phpStanNodeScopeResolver;
/**
* @readonly
* @var \PhpParser\NodeVisitor\NodeConnectingVisitor
*/
private $nodeConnectingVisitor;
/**
* @readonly
* @var \Rector\NodeTypeResolver\NodeVisitor\FunctionLikeParamArgPositionNodeVisitor
*/
private $functionLikeParamArgPositionNodeVisitor;
public function __construct(CloningVisitor $cloningVisitor, PHPStanNodeScopeResolver $phpStanNodeScopeResolver, NodeConnectingVisitor $nodeConnectingVisitor, FunctionLikeParamArgPositionNodeVisitor $functionLikeParamArgPositionNodeVisitor)
{
$this->cloningVisitor = $cloningVisitor;
$this->phpStanNodeScopeResolver = $phpStanNodeScopeResolver;
$this->nodeConnectingVisitor = $nodeConnectingVisitor;
$this->functionLikeParamArgPositionNodeVisitor = $functionLikeParamArgPositionNodeVisitor;
$this->nodeTraverser = new NodeTraverser();
// needed also for format preserving printing
$this->nodeTraverser->addVisitor($cloningVisitor);
// this one has to be run again to re-connect nodes with new attributes
$this->nodeTraverser->addVisitor($nodeConnectingVisitor);
$this->nodeTraverser->addVisitor($functionLikeParamArgPositionNodeVisitor);
}
/**
* @param Stmt[] $stmts
@ -46,12 +39,6 @@ final class NodeScopeAndMetadataDecorator
public function decorateNodesFromFile(File $file, array $stmts) : array
{
$stmts = $this->phpStanNodeScopeResolver->processNodes($stmts, $file->getFilePath());
$nodeTraverser = new NodeTraverser();
// needed also for format preserving printing
$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->functionLikeParamArgPositionNodeVisitor);
return $nodeTraverser->traverse($stmts);
return $this->nodeTraverser->traverse($stmts);
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'd0d87702a7b9a8140575d4bee3e9695199bb6338';
public const PACKAGE_VERSION = 'b3ea98f636dc6f965589eaf5fcf6dcda6e38cd9b';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-03-28 21:17:57';
public const RELEASE_DATE = '2023-03-28 21:19:11';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitb69f1f3889e7a6c43e601eea0e2d773b
class ComposerAutoloaderInit917c601cd2d45895becd6d5a14d781c0
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitb69f1f3889e7a6c43e601eea0e2d773b
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitb69f1f3889e7a6c43e601eea0e2d773b', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit917c601cd2d45895becd6d5a14d781c0', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitb69f1f3889e7a6c43e601eea0e2d773b', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit917c601cd2d45895becd6d5a14d781c0', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitb69f1f3889e7a6c43e601eea0e2d773b::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit917c601cd2d45895becd6d5a14d781c0::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitb69f1f3889e7a6c43e601eea0e2d773b::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit917c601cd2d45895becd6d5a14d781c0::$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 ComposerStaticInitb69f1f3889e7a6c43e601eea0e2d773b
class ComposerStaticInit917c601cd2d45895becd6d5a14d781c0
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3128,9 +3128,9 @@ class ComposerStaticInitb69f1f3889e7a6c43e601eea0e2d773b
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitb69f1f3889e7a6c43e601eea0e2d773b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb69f1f3889e7a6c43e601eea0e2d773b::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb69f1f3889e7a6c43e601eea0e2d773b::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit917c601cd2d45895becd6d5a14d781c0::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit917c601cd2d45895becd6d5a14d781c0::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit917c601cd2d45895becd6d5a14d781c0::$classMap;
}, null, ClassLoader::class);
}