mirror of
https://github.com/rectorphp/rector.git
synced 2025-02-09 01:21:17 +01:00
Updated Rector to commit 860603f58e9383217700622e873b857f2136b4e4
860603f58e
[Renaming] Handle rename property too when parent property renamed (#1031)
This commit is contained in:
parent
428f593818
commit
46f7c4b1c9
@ -9,6 +9,7 @@ use PhpParser\Node\Identifier;
|
||||
use PhpParser\Node\Stmt\ClassLike;
|
||||
use PhpParser\Node\Stmt\Property;
|
||||
use PhpParser\Node\VarLikeIdentifier;
|
||||
use PHPStan\Type\ObjectType;
|
||||
use PHPStan\Type\ThisType;
|
||||
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
|
||||
use Rector\Core\Rector\AbstractRector;
|
||||
@ -72,7 +73,10 @@ final class RenamePropertyRector extends \Rector\Core\Rector\AbstractRector impl
|
||||
$classLikeName = $this->nodeNameResolver->getName($classLike);
|
||||
$renamePropertyObjectType = $renameProperty->getObjectType();
|
||||
$className = $renamePropertyObjectType->getClassName();
|
||||
if ($classLikeName !== $className) {
|
||||
$classLikeNameObjectType = new \PHPStan\Type\ObjectType((string) $classLikeName);
|
||||
$classNameObjectType = new \PHPStan\Type\ObjectType($className);
|
||||
$isSuperType = $classNameObjectType->isSuperTypeOf($classLikeNameObjectType)->yes();
|
||||
if ($classLikeName !== $className && !$isSuperType) {
|
||||
return;
|
||||
}
|
||||
$property = $classLike->getProperty($renameProperty->getOldProperty());
|
||||
|
@ -16,11 +16,11 @@ final class VersionResolver
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = '07736c1ab4d45d348d5054625499f10f97d671be';
|
||||
public const PACKAGE_VERSION = '860603f58e9383217700622e873b857f2136b4e4';
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2021-10-20 12:11:06';
|
||||
public const RELEASE_DATE = '2021-10-21 00:13:04';
|
||||
public static function resolvePackageVersion() : string
|
||||
{
|
||||
$process = new \RectorPrefix20211020\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);
|
||||
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
@ -4,4 +4,4 @@
|
||||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInitff0ef0da3d0549299f4d003725bfd8d3::getLoader();
|
||||
return ComposerAutoloaderInit301244864bee443526416ec055a938a7::getLoader();
|
||||
|
14
vendor/composer/autoload_real.php
vendored
14
vendor/composer/autoload_real.php
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInitff0ef0da3d0549299f4d003725bfd8d3
|
||||
class ComposerAutoloaderInit301244864bee443526416ec055a938a7
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
@ -22,15 +22,15 @@ class ComposerAutoloaderInitff0ef0da3d0549299f4d003725bfd8d3
|
||||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInitff0ef0da3d0549299f4d003725bfd8d3', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit301244864bee443526416ec055a938a7', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInitff0ef0da3d0549299f4d003725bfd8d3', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit301244864bee443526416ec055a938a7', 'loadClassLoader'));
|
||||
|
||||
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
|
||||
if ($useStaticLoader) {
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInitff0ef0da3d0549299f4d003725bfd8d3::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit301244864bee443526416ec055a938a7::getInitializer($loader));
|
||||
} else {
|
||||
$classMap = require __DIR__ . '/autoload_classmap.php';
|
||||
if ($classMap) {
|
||||
@ -42,19 +42,19 @@ class ComposerAutoloaderInitff0ef0da3d0549299f4d003725bfd8d3
|
||||
$loader->register(true);
|
||||
|
||||
if ($useStaticLoader) {
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInitff0ef0da3d0549299f4d003725bfd8d3::$files;
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInit301244864bee443526416ec055a938a7::$files;
|
||||
} else {
|
||||
$includeFiles = require __DIR__ . '/autoload_files.php';
|
||||
}
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequireff0ef0da3d0549299f4d003725bfd8d3($fileIdentifier, $file);
|
||||
composerRequire301244864bee443526416ec055a938a7($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
}
|
||||
}
|
||||
|
||||
function composerRequireff0ef0da3d0549299f4d003725bfd8d3($fileIdentifier, $file)
|
||||
function composerRequire301244864bee443526416ec055a938a7($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
require $file;
|
||||
|
8
vendor/composer/autoload_static.php
vendored
8
vendor/composer/autoload_static.php
vendored
@ -4,7 +4,7 @@
|
||||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInitff0ef0da3d0549299f4d003725bfd8d3
|
||||
class ComposerStaticInit301244864bee443526416ec055a938a7
|
||||
{
|
||||
public static $files = array (
|
||||
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
|
||||
@ -3909,9 +3909,9 @@ class ComposerStaticInitff0ef0da3d0549299f4d003725bfd8d3
|
||||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInitff0ef0da3d0549299f4d003725bfd8d3::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInitff0ef0da3d0549299f4d003725bfd8d3::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInitff0ef0da3d0549299f4d003725bfd8d3::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit301244864bee443526416ec055a938a7::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit301244864bee443526416ec055a938a7::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit301244864bee443526416ec055a938a7::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
10
vendor/scoper-autoload.php
vendored
10
vendor/scoper-autoload.php
vendored
@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
|
||||
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
|
||||
spl_autoload_call('RectorPrefix20211020\AutoloadIncluder');
|
||||
}
|
||||
if (!class_exists('ComposerAutoloaderInitff0ef0da3d0549299f4d003725bfd8d3', false) && !interface_exists('ComposerAutoloaderInitff0ef0da3d0549299f4d003725bfd8d3', false) && !trait_exists('ComposerAutoloaderInitff0ef0da3d0549299f4d003725bfd8d3', false)) {
|
||||
spl_autoload_call('RectorPrefix20211020\ComposerAutoloaderInitff0ef0da3d0549299f4d003725bfd8d3');
|
||||
if (!class_exists('ComposerAutoloaderInit301244864bee443526416ec055a938a7', false) && !interface_exists('ComposerAutoloaderInit301244864bee443526416ec055a938a7', false) && !trait_exists('ComposerAutoloaderInit301244864bee443526416ec055a938a7', false)) {
|
||||
spl_autoload_call('RectorPrefix20211020\ComposerAutoloaderInit301244864bee443526416ec055a938a7');
|
||||
}
|
||||
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
|
||||
spl_autoload_call('RectorPrefix20211020\Helmich\TypoScriptParser\Parser\AST\Statement');
|
||||
@ -3306,9 +3306,9 @@ if (!function_exists('print_node')) {
|
||||
return \RectorPrefix20211020\print_node(...func_get_args());
|
||||
}
|
||||
}
|
||||
if (!function_exists('composerRequireff0ef0da3d0549299f4d003725bfd8d3')) {
|
||||
function composerRequireff0ef0da3d0549299f4d003725bfd8d3() {
|
||||
return \RectorPrefix20211020\composerRequireff0ef0da3d0549299f4d003725bfd8d3(...func_get_args());
|
||||
if (!function_exists('composerRequire301244864bee443526416ec055a938a7')) {
|
||||
function composerRequire301244864bee443526416ec055a938a7() {
|
||||
return \RectorPrefix20211020\composerRequire301244864bee443526416ec055a938a7(...func_get_args());
|
||||
}
|
||||
}
|
||||
if (!function_exists('parseArgs')) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user