octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-25 04:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit e8d0d572934d5faec64d480d9cd985a3823c9c0a

Browse Source 
e8d0d57293 Fix getter method property substitution when the readable types don't match. (#2667)
This commit is contained in:
Tomas Votruba 2022-07-15 23:16:52 +00:00
parent 6f2ea78a3d
commit 587cd1ea1b
5 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rules/CodeQuality/Rector/PropertyFetch/ExplicitMethodCallOverMagicGetSetRector.php
View File

@ -96,7 +96,7 @@ CODE_SAMPLE
if ($this->shouldSkipPropertyFetch($node)) {
return null;
}
return $this->refactorPropertyFetch($node);
return $this->refactorPropertyFetch($node, $scope);
}
/**
* @return string[]
@ -116,7 +116,7 @@ CODE_SAMPLE
/**
* @return \PhpParser\Node\Expr\MethodCall|null
*/
private function refactorPropertyFetch(PropertyFetch $propertyFetch)
private function refactorPropertyFetch(PropertyFetch $propertyFetch, Scope $scope)
{
$callerType = $this->getType($propertyFetch->var);
if (!$callerType instanceof ObjectType) {
@ -130,11 +130,19 @@ CODE_SAMPLE
if ($propertyName === null) {
return null;
}
$property = $callerType->getProperty($propertyName, $scope);
$propertyType = $property->getReadableType();
$possibleGetterMethodNames = $this->resolvePossibleGetMethodNames($propertyName);
foreach ($possibleGetterMethodNames as $possibleGetterMethodName) {
if (!$callerType->hasMethod($possibleGetterMethodName)->yes()) {
continue;
}
$methodReflection = $callerType->getMethod($possibleGetterMethodName, $scope);
$variant = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
$returnType = $variant->getReturnType();
if (!$propertyType->isSuperTypeOf($returnType)->yes()) {
continue;
}
return $this->nodeFactory->createMethodCall($propertyFetch->var, $possibleGetterMethodName);
}
return null;

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '12ab2ac8277a0899e2440ea36fb50ace4299f444';
public const PACKAGE_VERSION = 'e8d0d572934d5faec64d480d9cd985a3823c9c0a';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-07-16 03:42:02';
public const RELEASE_DATE = '2022-07-16 01:10:56';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit5f2e932e4721a50cb3ed73ca5b592961
class ComposerAutoloaderInitc7a83898e2099d2f9e00f124fc0c36b2
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit5f2e932e4721a50cb3ed73ca5b592961
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit5f2e932e4721a50cb3ed73ca5b592961', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitc7a83898e2099d2f9e00f124fc0c36b2', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit5f2e932e4721a50cb3ed73ca5b592961', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitc7a83898e2099d2f9e00f124fc0c36b2', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit5f2e932e4721a50cb3ed73ca5b592961::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitc7a83898e2099d2f9e00f124fc0c36b2::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit5f2e932e4721a50cb3ed73ca5b592961::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitc7a83898e2099d2f9e00f124fc0c36b2::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire5f2e932e4721a50cb3ed73ca5b592961($fileIdentifier, $file);
composerRequirec7a83898e2099d2f9e00f124fc0c36b2($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit5f2e932e4721a50cb3ed73ca5b592961
* @param string $file
* @return void
*/
function composerRequire5f2e932e4721a50cb3ed73ca5b592961($fileIdentifier, $file)
function composerRequirec7a83898e2099d2f9e00f124fc0c36b2($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 ComposerStaticInit5f2e932e4721a50cb3ed73ca5b592961
class ComposerStaticInitc7a83898e2099d2f9e00f124fc0c36b2
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3416,9 +3416,9 @@ class ComposerStaticInit5f2e932e4721a50cb3ed73ca5b592961
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit5f2e932e4721a50cb3ed73ca5b592961::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5f2e932e4721a50cb3ed73ca5b592961::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5f2e932e4721a50cb3ed73ca5b592961::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitc7a83898e2099d2f9e00f124fc0c36b2::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitc7a83898e2099d2f9e00f124fc0c36b2::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitc7a83898e2099d2f9e00f124fc0c36b2::$classMap;
}, null, ClassLoader::class);
}