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

Updated Rector to commit 1f8c88a5f1966ba9f3ec740f8c9bebc13f6d46f4

Browse Source 
1f8c88a5f1 fix reporting on renamed proeprty match type (#3098)
This commit is contained in:
Tomas Votruba 2022-11-26 13:09:30 +00:00
parent 3b829bfdce
commit 067bd1245f
6 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rules/Naming/PropertyRenamer/PropertyPromotionRenamer.php
View File

@ -76,14 +76,15 @@ final class PropertyPromotionRenamer
/**
* @param \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Interface_ $classLike
*/
public function renamePropertyPromotion($classLike) : void
public function renamePropertyPromotion($classLike) : bool
{
$hasChanged = \false;
if (!$this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::PROPERTY_PROMOTION)) {
return;
return \false;
}
$constructClassMethod = $classLike->getMethod(MethodName::CONSTRUCT);
if (!$constructClassMethod instanceof ClassMethod) {
return;
return \false;
}
// resolve possible and existing param names
$blockingParamNames = $this->resolveBlockingParamNames($constructClassMethod);
@ -104,7 +105,9 @@ final class PropertyPromotionRenamer
continue;
}
$this->renameParamVarNameAndVariableUsage($classLike, $constructClassMethod, $desiredPropertyName, $param);
$hasChanged = \true;
}
return $hasChanged;
}
private function renameParamVarNameAndVariableUsage(ClassLike $classLike, ClassMethod $classMethod, string $desiredPropertyName, Param $param) : void
{

11
rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php
View File

@ -97,11 +97,14 @@ CODE_SAMPLE
public function refactor(Node $node) : ?Node
{
$this->refactorClassProperties($node);
$this->propertyPromotionRenamer->renamePropertyPromotion($node);
if (!$this->hasChanged) {
return null;
$hasPromotedPropertyChanged = $this->propertyPromotionRenamer->renamePropertyPromotion($node);
if ($this->hasChanged) {
return $node;
}
return $node;
if ($hasPromotedPropertyChanged) {
return $node;
}
return null;
}
private function refactorClassProperties(ClassLike $classLike) : void
{

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '07b529abc4a1e8cd8ebe0ea90333a15016ab5062';
public const PACKAGE_VERSION = '1f8c88a5f1966ba9f3ec740f8c9bebc13f6d46f4';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-11-26 13:03:31';
public const RELEASE_DATE = '2022-11-26 13:03:57';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit0446b0f3b59f4be480c49770bbcf2be0
class ComposerAutoloaderInitd2a586c40de0c4aeca30196214f99730
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit0446b0f3b59f4be480c49770bbcf2be0
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit0446b0f3b59f4be480c49770bbcf2be0', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitd2a586c40de0c4aeca30196214f99730', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit0446b0f3b59f4be480c49770bbcf2be0', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitd2a586c40de0c4aeca30196214f99730', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit0446b0f3b59f4be480c49770bbcf2be0::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitd2a586c40de0c4aeca30196214f99730::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit0446b0f3b59f4be480c49770bbcf2be0::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitd2a586c40de0c4aeca30196214f99730::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire0446b0f3b59f4be480c49770bbcf2be0($fileIdentifier, $file);
composerRequired2a586c40de0c4aeca30196214f99730($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit0446b0f3b59f4be480c49770bbcf2be0
* @param string $file
* @return void
*/
function composerRequire0446b0f3b59f4be480c49770bbcf2be0($fileIdentifier, $file)
function composerRequired2a586c40de0c4aeca30196214f99730($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 ComposerStaticInit0446b0f3b59f4be480c49770bbcf2be0
class ComposerStaticInitd2a586c40de0c4aeca30196214f99730
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3038,9 +3038,9 @@ class ComposerStaticInit0446b0f3b59f4be480c49770bbcf2be0
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit0446b0f3b59f4be480c49770bbcf2be0::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0446b0f3b59f4be480c49770bbcf2be0::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0446b0f3b59f4be480c49770bbcf2be0::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitd2a586c40de0c4aeca30196214f99730::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd2a586c40de0c4aeca30196214f99730::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd2a586c40de0c4aeca30196214f99730::$classMap;
}, null, ClassLoader::class);
}