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

Updated Rector to commit 62d8685ce5b653a71014231d6a7dbf6934c30e60

Browse Source 
62d8685ce5 Reuse anonymous class detection via ClassAnalyzer on PHPStanNodeScopeResolver (#3393)
This commit is contained in:
Tomas Votruba 2023-02-19 17:53:18 +00:00
parent c97a6c91a3
commit f913db6069
6 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
View File

@ -46,10 +46,10 @@ use PHPStan\Type\TypeCombinator;
use Rector\Caching\Detector\ChangedFilesDetector;
use Rector\Caching\FileSystem\DependencyResolver;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\NodeAnalyzer\ClassAnalyzer;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\StaticReflection\SourceLocator\RenamedClassesSourceLocator;
use Rector\Core\Util\Reflection\PrivatesAccessor;
use Rector\Core\Util\StringUtils;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\RemoveDeepChainMethodCallNodeVisitor;
@ -60,11 +60,6 @@ use RectorPrefix202302\Webmozart\Assert\Assert;
*/
final class PHPStanNodeScopeResolver
{
/**
* @var string
* @see https://regex101.com/r/aXsCkK/1
*/
private const ANONYMOUS_CLASS_START_REGEX = '#^AnonymousClass(\\w+)#';
/**
* @var string
*/
@ -119,7 +114,12 @@ final class PHPStanNodeScopeResolver
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(ChangedFilesDetector $changedFilesDetector, DependencyResolver $dependencyResolver, NodeScopeResolver $nodeScopeResolver, ReflectionProvider $reflectionProvider, RemoveDeepChainMethodCallNodeVisitor $removeDeepChainMethodCallNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory $scopeFactory, PrivatesAccessor $privatesAccessor, RenamedClassesSourceLocator $renamedClassesSourceLocator, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder)
/**
* @readonly
* @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
*/
private $classAnalyzer;
public function __construct(ChangedFilesDetector $changedFilesDetector, DependencyResolver $dependencyResolver, NodeScopeResolver $nodeScopeResolver, ReflectionProvider $reflectionProvider, RemoveDeepChainMethodCallNodeVisitor $removeDeepChainMethodCallNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory $scopeFactory, PrivatesAccessor $privatesAccessor, RenamedClassesSourceLocator $renamedClassesSourceLocator, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, ClassAnalyzer $classAnalyzer)
{
$this->changedFilesDetector = $changedFilesDetector;
$this->dependencyResolver = $dependencyResolver;
@ -131,6 +131,7 @@ final class PHPStanNodeScopeResolver
$this->renamedClassesSourceLocator = $renamedClassesSourceLocator;
$this->nodeNameResolver = $nodeNameResolver;
$this->betterNodeFinder = $betterNodeFinder;
$this->classAnalyzer = $classAnalyzer;
$this->decoratePHPStanNodeScopeResolverWithRenamedClassSourceLocator($this->nodeScopeResolver);
}
/**
@ -353,7 +354,7 @@ final class PHPStanNodeScopeResolver
{
$className = $this->resolveClassName($classLike);
// is anonymous class? - not possible to enter it since PHPStan 0.12.33, see https://github.com/phpstan/phpstan-src/commit/e87fb0ec26f9c8552bbeef26a868b1e5d8185e91
if ($classLike instanceof Class_ && StringUtils::isMatch($className, self::ANONYMOUS_CLASS_START_REGEX)) {
if ($classLike instanceof Class_ && $this->classAnalyzer->isAnonymousClass($classLike)) {
$classReflection = $this->reflectionProvider->getAnonymousClassReflection($classLike, $mutatingScope);
} elseif (!$this->reflectionProvider->hasClass($className)) {
return $mutatingScope;

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'c65e60f70b628fd0602a9107189a1e9b6f0d3adf';
public const PACKAGE_VERSION = '62d8685ce5b653a71014231d6a7dbf6934c30e60';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-02-19 21:44:51';
public const RELEASE_DATE = '2023-02-19 17:49:00';
/**
* @var int
*/

4
src/NodeAnalyzer/ClassAnalyzer.php
View File

@ -13,9 +13,9 @@ final class ClassAnalyzer
{
/**
* @var string
* @see https://regex101.com/r/FQH6RT/1
* @see https://regex101.com/r/FQH6RT/2
*/
private const ANONYMOUS_CLASS_REGEX = '#AnonymousClass\\w+$#';
private const ANONYMOUS_CLASS_REGEX = '#^AnonymousClass\\w+$#';
/**
* @readonly
* @var \Rector\NodeNameResolver\NodeNameResolver

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

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