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

Updated Rector to commit e79aa9d760

Browse Source 
e79aa9d760 [Core][CodingStyle][NodeManipulator] Improve Classes to use BetterNodeFinder instead of NodeFinder when BetterNodeFinder already injected (#1158)
This commit is contained in:
Tomas Votruba 2021-11-05 17:11:17 +00:00
parent c76f97bfb2
commit ff1ad0ced7
12 changed files with 39 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rules/CodingStyle/ClassNameImport/ShortNameResolver.php
View File

@ -11,7 +11,6 @@ use PhpParser\Node\Name;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\Namespace_;
use PhpParser\NodeFinder;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\Reflection\ReflectionProvider;
@ -52,10 +51,6 @@ final class ShortNameResolver
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @var \PhpParser\NodeFinder
*/
private $nodeFinder;
/**
* @var \PHPStan\Reflection\ReflectionProvider
*/
@ -68,11 +63,10 @@ final class ShortNameResolver
* @var \Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher
*/
private $useImportNameMatcher;
public function __construct(\RectorPrefix20211105\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \PhpParser\NodeFinder $nodeFinder, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher $useImportNameMatcher)
public function __construct(\RectorPrefix20211105\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher $useImportNameMatcher)
{
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
$this->nodeNameResolver = $nodeNameResolver;
$this->nodeFinder = $nodeFinder;
$this->reflectionProvider = $reflectionProvider;
$this->betterNodeFinder = $betterNodeFinder;
$this->useImportNameMatcher = $useImportNameMatcher;
@ -110,7 +104,7 @@ final class ShortNameResolver
return [];
}
/** @var ClassLike[] $classLikes */
$classLikes = $this->nodeFinder->findInstanceOf($namespace, \PhpParser\Node\Stmt\ClassLike::class);
$classLikes = $this->betterNodeFinder->findInstanceOf($namespace, \PhpParser\Node\Stmt\ClassLike::class);
$shortClassLikeNames = [];
foreach ($classLikes as $classLike) {
$shortClassLikeNames[] = $this->nodeNameResolver->getShortName($classLike);
@ -187,7 +181,7 @@ final class ShortNameResolver
*/
private function resolveNativeClassReflection(array $stmts) : ?\ReflectionClass
{
$firstClassLike = $this->nodeFinder->findFirstInstanceOf($stmts, \PhpParser\Node\Stmt\ClassLike::class);
$firstClassLike = $this->betterNodeFinder->findFirstInstanceOf($stmts, \PhpParser\Node\Stmt\ClassLike::class);
if (!$firstClassLike instanceof \PhpParser\Node\Stmt\ClassLike) {
return null;
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '49aa15dbfb1932401ae68310c4064c273259ea4e';
public const PACKAGE_VERSION = 'e79aa9d760803cb2c7179bbe9822486805a92f5b';
/**
* @var string
*/
public const RELEASE_DATE = '2021-11-05 14:19:53';
public const RELEASE_DATE = '2021-11-05 23:53:40';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211105\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

10
src/NodeManipulator/ClassMethodAssignManipulator.php
View File

@ -16,7 +16,6 @@ use PhpParser\Node\Param;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Foreach_;
use PhpParser\NodeFinder;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Reflection\ParameterReflection;
use PHPStan\Type\Type;
@ -56,15 +55,11 @@ final class ClassMethodAssignManipulator
* @var \Rector\Core\Reflection\ReflectionResolver
*/
private $reflectionResolver;
/**
* @var \PhpParser\NodeFinder
*/
private $nodeFinder;
/**
* @var \Rector\Core\NodeManipulator\ArrayDestructVariableFilter
*/
private $arrayDestructVariableFilter;
public function __construct(\Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\Core\PhpParser\Node\NodeFactory $nodeFactory, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\Core\NodeManipulator\VariableManipulator $variableManipulator, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator, \Rector\Core\Reflection\ReflectionResolver $reflectionResolver, \PhpParser\NodeFinder $nodeFinder, \Rector\Core\NodeManipulator\ArrayDestructVariableFilter $arrayDestructVariableFilter)
public function __construct(\Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\Core\PhpParser\Node\NodeFactory $nodeFactory, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\Core\NodeManipulator\VariableManipulator $variableManipulator, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator, \Rector\Core\Reflection\ReflectionResolver $reflectionResolver, \Rector\Core\NodeManipulator\ArrayDestructVariableFilter $arrayDestructVariableFilter)
{
$this->betterNodeFinder = $betterNodeFinder;
$this->nodeFactory = $nodeFactory;
@ -72,7 +67,6 @@ final class ClassMethodAssignManipulator
$this->variableManipulator = $variableManipulator;
$this->nodeComparator = $nodeComparator;
$this->reflectionResolver = $reflectionResolver;
$this->nodeFinder = $nodeFinder;
$this->arrayDestructVariableFilter = $arrayDestructVariableFilter;
}
/**
@ -163,7 +157,7 @@ final class ClassMethodAssignManipulator
{
$referencedVariables = [];
/** @var Variable[] $variables */
$variables = $this->nodeFinder->findInstanceOf($classMethod, \PhpParser\Node\Expr\Variable::class);
$variables = $this->betterNodeFinder->findInstanceOf($classMethod, \PhpParser\Node\Expr\Variable::class);
foreach ($variables as $variable) {
if ($this->nodeNameResolver->isName($variable, 'this')) {
continue;

12
src/PhpParser/AstResolver.php
View File

@ -16,7 +16,6 @@ use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Interface_;
use PhpParser\Node\Stmt\Property;
use PhpParser\Node\Stmt\Trait_;
use PhpParser\NodeFinder;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\FunctionReflection;
@ -62,10 +61,6 @@ final class AstResolver
* @var \Symplify\SmartFileSystem\SmartFileSystem
*/
private $smartFileSystem;
/**
* @var \PhpParser\NodeFinder
*/
private $nodeFinder;
/**
* @var \Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator
*/
@ -94,11 +89,10 @@ final class AstResolver
* @var \Rector\Core\PhpParser\ClassLikeAstResolver
*/
private $classLikeAstResolver;
public function __construct(\RectorPrefix20211105\Symplify\Astral\PhpParser\SmartPhpParser $smartPhpParser, \RectorPrefix20211105\Symplify\SmartFileSystem\SmartFileSystem $smartFileSystem, \PhpParser\NodeFinder $nodeFinder, \Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\Core\Reflection\ReflectionResolver $reflectionResolver, \Rector\NodeTypeResolver\NodeTypeResolver $nodeTypeResolver, \Rector\Core\PhpParser\ClassLikeAstResolver $classLikeAstResolver)
public function __construct(\RectorPrefix20211105\Symplify\Astral\PhpParser\SmartPhpParser $smartPhpParser, \RectorPrefix20211105\Symplify\SmartFileSystem\SmartFileSystem $smartFileSystem, \Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\Core\Reflection\ReflectionResolver $reflectionResolver, \Rector\NodeTypeResolver\NodeTypeResolver $nodeTypeResolver, \Rector\Core\PhpParser\ClassLikeAstResolver $classLikeAstResolver)
{
$this->smartPhpParser = $smartPhpParser;
$this->smartFileSystem = $smartFileSystem;
$this->nodeFinder = $nodeFinder;
$this->nodeScopeAndMetadataDecorator = $nodeScopeAndMetadataDecorator;
$this->betterNodeFinder = $betterNodeFinder;
$this->nodeNameResolver = $nodeNameResolver;
@ -146,7 +140,7 @@ final class AstResolver
if ($nodes === null) {
return null;
}
$class = $this->nodeFinder->findFirstInstanceOf($nodes, \PhpParser\Node\Stmt\Class_::class);
$class = $this->betterNodeFinder->findFirstInstanceOf($nodes, \PhpParser\Node\Stmt\Class_::class);
if (!$class instanceof \PhpParser\Node\Stmt\Class_) {
// avoids looking for a class in a file where is not present
$this->classMethodsByClassAndMethod[$classReflection->getName()][$methodReflection->getName()] = null;
@ -187,7 +181,7 @@ final class AstResolver
return null;
}
/** @var Function_[] $functions */
$functions = $this->nodeFinder->findInstanceOf($nodes, \PhpParser\Node\Stmt\Function_::class);
$functions = $this->betterNodeFinder->findInstanceOf($nodes, \PhpParser\Node\Stmt\Function_::class);
foreach ($functions as $function) {
if (!$this->nodeNameResolver->isName($function, $functionReflection->getName())) {
continue;

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit1597e5290d82f782f1db9173ddac309a::getLoader();
return ComposerAutoloaderInitd4cb78f26bd1b7e1763b12f0c073efa6::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit1597e5290d82f782f1db9173ddac309a
class ComposerAutoloaderInitd4cb78f26bd1b7e1763b12f0c073efa6
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit1597e5290d82f782f1db9173ddac309a
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit1597e5290d82f782f1db9173ddac309a', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitd4cb78f26bd1b7e1763b12f0c073efa6', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit1597e5290d82f782f1db9173ddac309a', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitd4cb78f26bd1b7e1763b12f0c073efa6', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit1597e5290d82f782f1db9173ddac309a::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitd4cb78f26bd1b7e1763b12f0c073efa6::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit1597e5290d82f782f1db9173ddac309a
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit1597e5290d82f782f1db9173ddac309a::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitd4cb78f26bd1b7e1763b12f0c073efa6::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire1597e5290d82f782f1db9173ddac309a($fileIdentifier, $file);
composerRequired4cb78f26bd1b7e1763b12f0c073efa6($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire1597e5290d82f782f1db9173ddac309a($fileIdentifier, $file)
function composerRequired4cb78f26bd1b7e1763b12f0c073efa6($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit1597e5290d82f782f1db9173ddac309a
class ComposerStaticInitd4cb78f26bd1b7e1763b12f0c073efa6
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3522,9 +3522,9 @@ class ComposerStaticInit1597e5290d82f782f1db9173ddac309a
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit1597e5290d82f782f1db9173ddac309a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit1597e5290d82f782f1db9173ddac309a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit1597e5290d82f782f1db9173ddac309a::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitd4cb78f26bd1b7e1763b12f0c073efa6::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd4cb78f26bd1b7e1763b12f0c073efa6::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd4cb78f26bd1b7e1763b12f0c073efa6::$classMap;
}, null, ClassLoader::class);
}

16
vendor/composer/installed.json vendored
View File

@ -1005,23 +1005,23 @@
},
{
"name": "psr\/container",
"version": "1.1.1",
"version_normalized": "1.1.1.0",
"version": "1.1.2",
"version_normalized": "1.1.2.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/php-fig\/container.git",
"reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
"reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/php-fig\/container\/zipball\/8622567409010282b7aeebe4bb841fe98b58dcaf",
"reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
"url": "https:\/\/api.github.com\/repos\/php-fig\/container\/zipball\/513e0666f7216c7459170d56df27dfcefe1689ea",
"reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
"shasum": ""
},
"require": {
"php": ">=7.2.0"
"php": ">=7.4.0"
},
"time": "2021-03-05T17:36:06+00:00",
"time": "2021-11-05T16:50:12+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -1050,7 +1050,7 @@
],
"support": {
"issues": "https:\/\/github.com\/php-fig\/container\/issues",
"source": "https:\/\/github.com\/php-fig\/container\/tree\/1.1.1"
"source": "https:\/\/github.com\/php-fig\/container\/tree\/1.1.2"
},
"install-path": "..\/psr\/container"
},

2
vendor/composer/installed.php vendored
View File

File diff suppressed because one or more lines are too long

2
vendor/psr/container/composer.json vendored
View File

@ -18,7 +18,7 @@
}
],
"require": {
"php": ">=7.2.0"
"php": ">=7.4.0"
},
"autoload": {
"psr-4": {

3
vendor/psr/container/src/ContainerExceptionInterface.php vendored
View File

@ -2,9 +2,10 @@
namespace RectorPrefix20211105\Psr\Container;
use Throwable;
/**
* Base interface representing a generic exception in a container.
*/
interface ContainerExceptionInterface
interface ContainerExceptionInterface extends \Throwable
{
}

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('RectorPrefix20211105\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit1597e5290d82f782f1db9173ddac309a', false) && !interface_exists('ComposerAutoloaderInit1597e5290d82f782f1db9173ddac309a', false) && !trait_exists('ComposerAutoloaderInit1597e5290d82f782f1db9173ddac309a', false)) {
spl_autoload_call('RectorPrefix20211105\ComposerAutoloaderInit1597e5290d82f782f1db9173ddac309a');
if (!class_exists('ComposerAutoloaderInitd4cb78f26bd1b7e1763b12f0c073efa6', false) && !interface_exists('ComposerAutoloaderInitd4cb78f26bd1b7e1763b12f0c073efa6', false) && !trait_exists('ComposerAutoloaderInitd4cb78f26bd1b7e1763b12f0c073efa6', false)) {
spl_autoload_call('RectorPrefix20211105\ComposerAutoloaderInitd4cb78f26bd1b7e1763b12f0c073efa6');
}
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('RectorPrefix20211105\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3306,9 +3306,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211105\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire1597e5290d82f782f1db9173ddac309a')) {
function composerRequire1597e5290d82f782f1db9173ddac309a() {
return \RectorPrefix20211105\composerRequire1597e5290d82f782f1db9173ddac309a(...func_get_args());
if (!function_exists('composerRequired4cb78f26bd1b7e1763b12f0c073efa6')) {
function composerRequired4cb78f26bd1b7e1763b12f0c073efa6() {
return \RectorPrefix20211105\composerRequired4cb78f26bd1b7e1763b12f0c073efa6(...func_get_args());
}
}
if (!function_exists('parseArgs')) {