octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 0bdace5619d44c2ab3b30254f3ef06fe5e90e6fa 

0bdace5619 [Php80] Handle crash Property ReflectionEnum::$betterReflectionClass does not exist on AddParamBasedOnParentClassMethodRector on Enum usage (#4758)
This commit is contained in:
Tomas Votruba 2023-08-10 14:35:27 +00:00
parent 77447fc516
commit fb1f63e38b
9 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php
View File

@ -4,12 +4,11 @@ declare (strict_types=1);
namespace Rector\VendorLocker;
use PhpParser\Node\Stmt\ClassMethod;
use PHPStan\BetterReflection\Reflection\ReflectionClass;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Type\Type;
use Rector\Core\Reflection\ClassReflectionAnalyzer;
use Rector\Core\Reflection\ReflectionResolver;
use Rector\Core\Util\Reflection\PrivatesAccessor;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
use Rector\StaticTypeMapper\StaticTypeMapper;
@ -38,16 +37,16 @@ final class ParentClassMethodTypeOverrideGuard
private $staticTypeMapper;
/**
* @readonly
* @var \Rector\Core\Util\Reflection\PrivatesAccessor
* @var \Rector\Core\Reflection\ClassReflectionAnalyzer
*/
private $privatesAccessor;
public function __construct(NodeNameResolver $nodeNameResolver, ReflectionResolver $reflectionResolver, TypeComparator $typeComparator, StaticTypeMapper $staticTypeMapper, PrivatesAccessor $privatesAccessor)
private $classReflectionAnalyzer;
public function __construct(NodeNameResolver $nodeNameResolver, ReflectionResolver $reflectionResolver, TypeComparator $typeComparator, StaticTypeMapper $staticTypeMapper, ClassReflectionAnalyzer $classReflectionAnalyzer)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->reflectionResolver = $reflectionResolver;
$this->typeComparator = $typeComparator;
$this->staticTypeMapper = $staticTypeMapper;
$this->privatesAccessor = $privatesAccessor;
$this->classReflectionAnalyzer = $classReflectionAnalyzer;
}
public function hasParentClassMethod(ClassMethod $classMethod) : bool
{
@ -110,11 +109,6 @@ final class ParentClassMethodTypeOverrideGuard
}
private function hasClassParent(ClassReflection $classReflection) : bool
{
// XXX rework this hack, after https://github.com/phpstan/phpstan-src/pull/2563 landed
$nativeReflection = $classReflection->getNativeReflection();
$betterReflectionClass = $this->privatesAccessor->getPrivateProperty($nativeReflection, 'betterReflectionClass');
/** @var ReflectionClass $betterReflectionClass */
$parentClassName = $betterReflectionClass->getParentClassName();
return $parentClassName !== null;
return $this->classReflectionAnalyzer->resolveParentClassName($classReflection) !== null;
}
}

17
rules/Privatization/Guard/ParentPropertyLookupGuard.php
View File

@ -10,14 +10,13 @@ use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\Property;
use PHPStan\BetterReflection\Reflection\ReflectionClass;
use PHPStan\Reflection\ClassReflection;
use Rector\Core\Enum\ObjectReference;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\NodeManipulator\PropertyManipulator;
use Rector\Core\PhpParser\AstResolver;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\Util\Reflection\PrivatesAccessor;
use Rector\Core\Reflection\ClassReflectionAnalyzer;
use Rector\NodeNameResolver\NodeNameResolver;
final class ParentPropertyLookupGuard
{
@ -48,17 +47,17 @@ final class ParentPropertyLookupGuard
private $propertyManipulator;
/**
* @readonly
* @var \Rector\Core\Util\Reflection\PrivatesAccessor
* @var \Rector\Core\Reflection\ClassReflectionAnalyzer
*/
private $privatesAccessor;
public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, AstResolver $astResolver, PropertyManipulator $propertyManipulator, PrivatesAccessor $privatesAccessor)
private $classReflectionAnalyzer;
public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, AstResolver $astResolver, PropertyManipulator $propertyManipulator, ClassReflectionAnalyzer $classReflectionAnalyzer)
{
$this->betterNodeFinder = $betterNodeFinder;
$this->nodeNameResolver = $nodeNameResolver;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
$this->astResolver = $astResolver;
$this->propertyManipulator = $propertyManipulator;
$this->privatesAccessor = $privatesAccessor;
$this->classReflectionAnalyzer = $classReflectionAnalyzer;
}
public function isLegal(Property $property, ?ClassReflection $classReflection) : bool
{
@ -72,11 +71,7 @@ final class ParentPropertyLookupGuard
if ($this->propertyManipulator->isUsedByTrait($classReflection, $propertyName)) {
return \false;
}
// XXX rework this hack, after https://github.com/phpstan/phpstan-src/pull/2563 landed
$nativeReflection = $classReflection->getNativeReflection();
$betterReflectionClass = $this->privatesAccessor->getPrivateProperty($nativeReflection, 'betterReflectionClass');
/** @var ReflectionClass $betterReflectionClass */
$parentClassName = $betterReflectionClass->getParentClassName();
$parentClassName = $this->classReflectionAnalyzer->resolveParentClassName($classReflection);
if ($parentClassName === null) {
return \true;
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'e9ff73fa36a3e8afcbbdefd2cc0675fdb239fb21';
public const PACKAGE_VERSION = '0bdace5619d44c2ab3b30254f3ef06fe5e90e6fa';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-10 14:14:26';
public const RELEASE_DATE = '2023-08-10 21:31:43';
/**
* @var int
*/

17
src/PhpParser/Node/Value/ValueResolver.php
View File

@ -13,7 +13,6 @@ use PhpParser\Node\Name;
use PhpParser\Node\Scalar\MagicConst\Dir;
use PhpParser\Node\Scalar\MagicConst\File;
use PHPStan\Analyser\Scope;
use PHPStan\BetterReflection\Reflection\ReflectionClass;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\ReflectionProvider;
use PHPStan\Type\Constant\ConstantArrayType;
@ -23,8 +22,8 @@ use Rector\Core\Enum\ObjectReference;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\NodeAnalyzer\ConstFetchAnalyzer;
use Rector\Core\Provider\CurrentFileProvider;
use Rector\Core\Reflection\ClassReflectionAnalyzer;
use Rector\Core\Reflection\ReflectionResolver;
use Rector\Core\Util\Reflection\PrivatesAccessor;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\NodeTypeResolver;
@ -67,14 +66,14 @@ final class ValueResolver
private $reflectionResolver;
/**
* @readonly
* @var \Rector\Core\Util\Reflection\PrivatesAccessor
* @var \Rector\Core\Reflection\ClassReflectionAnalyzer
*/
private $privatesAccessor;
private $classReflectionAnalyzer;
/**
* @var \PhpParser\ConstExprEvaluator|null
*/
private $constExprEvaluator;
public function __construct(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, ConstFetchAnalyzer $constFetchAnalyzer, ReflectionProvider $reflectionProvider, CurrentFileProvider $currentFileProvider, ReflectionResolver $reflectionResolver, PrivatesAccessor $privatesAccessor)
public function __construct(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, ConstFetchAnalyzer $constFetchAnalyzer, ReflectionProvider $reflectionProvider, CurrentFileProvider $currentFileProvider, ReflectionResolver $reflectionResolver, ClassReflectionAnalyzer $classReflectionAnalyzer)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->nodeTypeResolver = $nodeTypeResolver;
@ -82,7 +81,7 @@ final class ValueResolver
$this->reflectionProvider = $reflectionProvider;
$this->currentFileProvider = $currentFileProvider;
$this->reflectionResolver = $reflectionResolver;
$this->privatesAccessor = $privatesAccessor;
$this->classReflectionAnalyzer = $classReflectionAnalyzer;
}
/**
* @param mixed $value
@ -312,12 +311,8 @@ final class ValueResolver
if (!$classReflection->isClass()) {
throw new ShouldNotHappenException('Complete class parent node for to class const fetch, so "parent" references is resolvable to lookup parent class');
}
// XXX rework this hack, after https://github.com/phpstan/phpstan-src/pull/2563 landed
// ensure parent class name still resolved even not autoloaded
$nativeReflection = $classReflection->getNativeReflection();
$betterReflectionClass = $this->privatesAccessor->getPrivateProperty($nativeReflection, 'betterReflectionClass');
/** @var ReflectionClass $betterReflectionClass */
$parentClassName = $betterReflectionClass->getParentClassName();
$parentClassName = $this->classReflectionAnalyzer->resolveParentClassName($classReflection);
if ($parentClassName === null) {
throw new ShouldNotHappenException();
}

31
src/Reflection/ClassReflectionAnalyzer.php Normal file
View File

@ -0,0 +1,31 @@
<?php
declare (strict_types=1);
namespace Rector\Core\Reflection;
use ReflectionEnum;
use PHPStan\Reflection\ClassReflection;
use Rector\Core\Util\Reflection\PrivatesAccessor;
use PHPStan\BetterReflection\Reflection\ReflectionClass;
final class ClassReflectionAnalyzer
{
/**
* @readonly
* @var \Rector\Core\Util\Reflection\PrivatesAccessor
*/
private $privatesAccessor;
public function __construct(PrivatesAccessor $privatesAccessor)
{
$this->privatesAccessor = $privatesAccessor;
}
public function resolveParentClassName(ClassReflection $classReflection) : ?string
{
$nativeReflection = $classReflection->getNativeReflection();
if ($nativeReflection instanceof ReflectionEnum) {
return null;
}
$betterReflectionClass = $this->privatesAccessor->getPrivateProperty($nativeReflection, 'betterReflectionClass');
/** @var ReflectionClass $betterReflectionClass */
return $betterReflectionClass->getParentClassName();
}
}

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1628,6 +1628,7 @@ return array(
'Rector\\Core\\Provider\\CurrentFileProvider' => $baseDir . '/src/Provider/CurrentFileProvider.php',
'Rector\\Core\\Rector\\AbstractRector' => $baseDir . '/src/Rector/AbstractRector.php',
'Rector\\Core\\Rector\\AbstractScopeAwareRector' => $baseDir . '/src/Rector/AbstractScopeAwareRector.php',
'Rector\\Core\\Reflection\\ClassReflectionAnalyzer' => $baseDir . '/src/Reflection/ClassReflectionAnalyzer.php',
'Rector\\Core\\Reflection\\MethodReflectionResolver' => $baseDir . '/src/Reflection/MethodReflectionResolver.php',
'Rector\\Core\\Reflection\\ReflectionResolver' => $baseDir . '/src/Reflection/ReflectionResolver.php',
'Rector\\Core\\StaticReflection\\DynamicSourceLocatorDecorator' => $baseDir . '/src/StaticReflection/DynamicSourceLocatorDecorator.php',

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit3b2594010a41c9aaf4067af07e92550b
class ComposerAutoloaderInitcaf0e871d4992ef34d72bc009e96a710
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit3b2594010a41c9aaf4067af07e92550b
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit3b2594010a41c9aaf4067af07e92550b', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitcaf0e871d4992ef34d72bc009e96a710', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit3b2594010a41c9aaf4067af07e92550b', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitcaf0e871d4992ef34d72bc009e96a710', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit3b2594010a41c9aaf4067af07e92550b::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitcaf0e871d4992ef34d72bc009e96a710::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit3b2594010a41c9aaf4067af07e92550b::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInitcaf0e871d4992ef34d72bc009e96a710::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit3b2594010a41c9aaf4067af07e92550b
class ComposerStaticInitcaf0e871d4992ef34d72bc009e96a710
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -1882,6 +1882,7 @@ class ComposerStaticInit3b2594010a41c9aaf4067af07e92550b
'Rector\\Core\\Provider\\CurrentFileProvider' => __DIR__ . '/../..' . '/src/Provider/CurrentFileProvider.php',
'Rector\\Core\\Rector\\AbstractRector' => __DIR__ . '/../..' . '/src/Rector/AbstractRector.php',
'Rector\\Core\\Rector\\AbstractScopeAwareRector' => __DIR__ . '/../..' . '/src/Rector/AbstractScopeAwareRector.php',
'Rector\\Core\\Reflection\\ClassReflectionAnalyzer' => __DIR__ . '/../..' . '/src/Reflection/ClassReflectionAnalyzer.php',
'Rector\\Core\\Reflection\\MethodReflectionResolver' => __DIR__ . '/../..' . '/src/Reflection/MethodReflectionResolver.php',
'Rector\\Core\\Reflection\\ReflectionResolver' => __DIR__ . '/../..' . '/src/Reflection/ReflectionResolver.php',
'Rector\\Core\\StaticReflection\\DynamicSourceLocatorDecorator' => __DIR__ . '/../..' . '/src/StaticReflection/DynamicSourceLocatorDecorator.php',
@ -2999,9 +3000,9 @@ class ComposerStaticInit3b2594010a41c9aaf4067af07e92550b
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit3b2594010a41c9aaf4067af07e92550b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit3b2594010a41c9aaf4067af07e92550b::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit3b2594010a41c9aaf4067af07e92550b::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitcaf0e871d4992ef34d72bc009e96a710::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitcaf0e871d4992ef34d72bc009e96a710::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitcaf0e871d4992ef34d72bc009e96a710::$classMap;
}, null, ClassLoader::class);
}