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 ea91c99695a8a8108bad4428c7febcf4222a363d 

ea91c99695 Reduce private accessor usage on get parent class name not autoload (#4726)
This commit is contained in:
Tomas Votruba 2023-08-09 02:16:25 +00:00
parent 62bbbc5de1
commit 6703dc85ab
7 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php
View File

@ -3,6 +3,7 @@
declare (strict_types=1);
namespace Rector\VendorLocker;
use PHPStan\BetterReflection\Reflection\ReflectionClass;
use PhpParser\Node\Stmt\ClassMethod;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
@ -112,7 +113,8 @@ final class ParentClassMethodTypeOverrideGuard
// XXX rework this hack, after https://github.com/phpstan/phpstan-src/pull/2563 landed
$nativeReflection = $classReflection->getNativeReflection();
$betterReflectionClass = $this->privatesAccessor->getPrivateProperty($nativeReflection, 'betterReflectionClass');
$parentClassName = $this->privatesAccessor->getPrivateProperty($betterReflectionClass, 'parentClassName');
/** @var ReflectionClass $betterReflectionClass */
$parentClassName = $betterReflectionClass->getParentClassName();
return $parentClassName !== null;
}
}

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

@ -3,6 +3,7 @@
declare (strict_types=1);
namespace Rector\Privatization\Guard;
use PHPStan\BetterReflection\Reflection\ReflectionClass;
use PhpParser\Node;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticPropertyFetch;
@ -74,7 +75,8 @@ final class ParentPropertyLookupGuard
// XXX rework this hack, after https://github.com/phpstan/phpstan-src/pull/2563 landed
$nativeReflection = $classReflection->getNativeReflection();
$betterReflectionClass = $this->privatesAccessor->getPrivateProperty($nativeReflection, 'betterReflectionClass');
$parentClassName = $this->privatesAccessor->getPrivateProperty($betterReflectionClass, 'parentClassName');
/** @var ReflectionClass $betterReflectionClass */
$parentClassName = $betterReflectionClass->getParentClassName();
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 = '662cbb9e6b9cf4842d833965dceed8eec77a0e17';
public const PACKAGE_VERSION = 'ea91c99695a8a8108bad4428c7febcf4222a363d';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-08 17:28:47';
public const RELEASE_DATE = '2023-08-09 09:12:07';
/**
* @var int
*/

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

@ -3,6 +3,7 @@
declare (strict_types=1);
namespace Rector\Core\PhpParser\Node\Value;
use PHPStan\BetterReflection\Reflection\ReflectionClass;
use PhpParser\ConstExprEvaluationException;
use PhpParser\ConstExprEvaluator;
use PhpParser\Node\Expr;
@ -315,7 +316,8 @@ final class ValueResolver
// ensure parent class name still resolved even not autoloaded
$nativeReflection = $classReflection->getNativeReflection();
$betterReflectionClass = $this->privatesAccessor->getPrivateProperty($nativeReflection, 'betterReflectionClass');
$parentClassName = $this->privatesAccessor->getPrivateProperty($betterReflectionClass, 'parentClassName');
/** @var ReflectionClass $betterReflectionClass */
$parentClassName = $betterReflectionClass->getParentClassName();
if ($parentClassName === null) {
throw new ShouldNotHappenException();
}

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

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