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

Updated Rector to commit d50b87a09c87754d98ad8d2eecdb7862df876510

Browse Source 
d50b87a09c [NodeManipulator] Remove parent lookup on ClassConstManipulator (#4236)
This commit is contained in:
Tomas Votruba 2023-06-16 04:24:30 +00:00
parent af06891b34
commit 84c71be628
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '6488506a36f117e947056eff9f27157a82bf102b';
public const PACKAGE_VERSION = 'd50b87a09c87754d98ad8d2eecdb7862df876510';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-06-16 10:34:40';
public const RELEASE_DATE = '2023-06-16 11:19:41';
/**
* @var int
*/

17
src/NodeManipulator/ClassConstManipulator.php
View File

@ -5,13 +5,12 @@ namespace Rector\Core\NodeManipulator;
use PhpParser\Node;
use PhpParser\Node\Expr\ClassConstFetch;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassConst;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\Enum_;
use PHPStan\Reflection\ClassReflection;
use Rector\Core\PhpParser\AstResolver;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\Reflection\ReflectionResolver;
use Rector\NodeNameResolver\NodeNameResolver;
final class ClassConstManipulator
{
@ -30,19 +29,25 @@ final class ClassConstManipulator
* @var \Rector\Core\PhpParser\AstResolver
*/
private $astResolver;
public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver, AstResolver $astResolver)
/**
* @readonly
* @var \Rector\Core\Reflection\ReflectionResolver
*/
private $reflectionResolver;
public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver, AstResolver $astResolver, ReflectionResolver $reflectionResolver)
{
$this->betterNodeFinder = $betterNodeFinder;
$this->nodeNameResolver = $nodeNameResolver;
$this->astResolver = $astResolver;
$this->reflectionResolver = $reflectionResolver;
}
public function hasClassConstFetch(ClassConst $classConst, ClassReflection $classReflection) : bool
{
$class = $this->betterNodeFinder->findParentByTypes($classConst, [Class_::class, Enum_::class]);
if (!$class instanceof ClassLike) {
$classReflection = $this->reflectionResolver->resolveClassReflection($classConst);
if (!$classReflection instanceof ClassReflection || !$classReflection->isClass() && !$classReflection->isEnum()) {
return \true;
}
$className = (string) $this->nodeNameResolver->getName($class);
$className = $classReflection->getName();
foreach ($classReflection->getAncestors() as $ancestorClassReflection) {
$ancestorClass = $this->astResolver->resolveClassFromClassReflection($ancestorClassReflection);
if (!$ancestorClass instanceof ClassLike) {

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

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