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

Updated Rector to commit cc6dc93b566930e66b61ee04205ef943a8d9d339

Browse Source 
cc6dc93b56 [CodeQuality] Reduce parent lookup on LocalPropertyAnalyzer::resolveFetchedPropertiesToTypesFromClass() (#4004)
This commit is contained in:
Tomas Votruba 2023-05-28 20:47:12 +00:00
parent 84236fa01b
commit 1e426f9497
6 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rules/CodeQuality/NodeAnalyzer/LocalPropertyAnalyzer.php
View File

@ -11,14 +11,13 @@ use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PhpParser\NodeTraverser;
use PHPStan\Type\MixedType;
use PHPStan\Type\Type;
use Rector\CodeQuality\TypeResolver\ArrayDimFetchTypeResolver;
use Rector\Core\NodeAnalyzer\ClassAnalyzer;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeNameResolver\NodeNameResolver;
@ -37,11 +36,6 @@ final class LocalPropertyAnalyzer
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
*/
private $simpleCallableNodeTraverser;
/**
* @readonly
* @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
*/
private $classAnalyzer;
/**
* @readonly
* @var \Rector\NodeNameResolver\NodeNameResolver
@ -72,10 +66,9 @@ final class LocalPropertyAnalyzer
* @var \Rector\NodeTypeResolver\PHPStan\Type\TypeFactory
*/
private $typeFactory;
public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, ClassAnalyzer $classAnalyzer, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, ArrayDimFetchTypeResolver $arrayDimFetchTypeResolver, NodeTypeResolver $nodeTypeResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, TypeFactory $typeFactory)
public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, ArrayDimFetchTypeResolver $arrayDimFetchTypeResolver, NodeTypeResolver $nodeTypeResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, TypeFactory $typeFactory)
{
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
$this->classAnalyzer = $classAnalyzer;
$this->nodeNameResolver = $nodeNameResolver;
$this->betterNodeFinder = $betterNodeFinder;
$this->arrayDimFetchTypeResolver = $arrayDimFetchTypeResolver;
@ -89,10 +82,13 @@ final class LocalPropertyAnalyzer
public function resolveFetchedPropertiesToTypesFromClass(Class_ $class) : array
{
$fetchedLocalPropertyNameToTypes = [];
$this->simpleCallableNodeTraverser->traverseNodesWithCallable($class->stmts, function (Node $node) use(&$fetchedLocalPropertyNameToTypes) : ?int {
// skip anonymous class scope
$isAnonymousClass = $this->classAnalyzer->isAnonymousClass($node);
if ($isAnonymousClass) {
$this->simpleCallableNodeTraverser->traverseNodesWithCallable($class->getMethods(), function (Node $node) use(&$fetchedLocalPropertyNameToTypes) : ?int {
// skip anonymous classes and inner function
if ($node instanceof Class_ || $node instanceof Function_) {
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
}
// skip closure call
if ($node instanceof MethodCall && $node->var instanceof Closure) {
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
}
if (!$node instanceof PropertyFetch) {
@ -108,10 +104,6 @@ final class LocalPropertyAnalyzer
if ($propertyName === null) {
return null;
}
$parentFunctionLike = $this->betterNodeFinder->findParentType($node, FunctionLike::class);
if (!$parentFunctionLike instanceof ClassMethod) {
return null;
}
$fetchedLocalPropertyNameToTypes[$propertyName][] = $this->resolvePropertyFetchType($node);
return null;
});

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '25d6a9740ed21735c4194b94f4d5cabe5b976832';
public const PACKAGE_VERSION = 'cc6dc93b566930e66b61ee04205ef943a8d9d339';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-28 21:41:47';
public const RELEASE_DATE = '2023-05-28 20:43:22';
/**
* @var int
*/

2
src/Kernel/RectorKernel.php
View File

@ -15,7 +15,7 @@ final class RectorKernel
/**
* @var string
*/
private const CACHE_KEY = 'v40';
private const CACHE_KEY = 'v41';
/**
* @var \Symfony\Component\DependencyInjection\ContainerInterface|null
*/

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

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