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 6a8ebb97e32dbd283ebb1e83d9eae7dacdb2df2b 

6a8ebb97e3 Fix ShortenedObjectType not resolving to correct class reflection (#3397)
This commit is contained in:
Tomas Votruba 2023-05-06 16:51:05 +00:00
parent 511bba65db
commit a02530c7e5
6 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php
View File

@ -107,6 +107,13 @@ final class RemoveExtraParametersRector extends AbstractRector implements MinPhp
return \true;
}
}
if ($reflection instanceof MethodReflection) {
$class = $reflection->getDeclaringClass();
$fileName = (string) $class->getFileName();
if (\strpos($fileName, 'phpstan.phar') !== \false) {
return \true;
}
}
return \false;
}
/**

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '48e431b52386ed8a200bc5f6e697fcf6f3a2db8f';
public const PACKAGE_VERSION = '6a8ebb97e32dbd283ebb1e83d9eae7dacdb2df2b';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-06 17:28:59';
public const RELEASE_DATE = '2023-05-06 17:47:20';
/**
* @var int
*/

10
src/Reflection/ReflectionResolver.php
View File

@ -31,6 +31,7 @@ use Rector\Core\ValueObject\MethodName;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\NodeTypeResolver;
use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
use RectorPrefix202305\Symfony\Contracts\Service\Attribute\Required;
final class ReflectionResolver
{
@ -151,8 +152,13 @@ final class ReflectionResolver
public function resolveMethodReflectionFromStaticCall(StaticCall $staticCall) : ?MethodReflection
{
$objectType = $this->nodeTypeResolver->getType($staticCall->class);
/** @var array<class-string> $classNames */
$classNames = TypeUtils::getDirectClassNames($objectType);
if ($objectType instanceof ShortenedObjectType) {
/** @var array<class-string> $classNames */
$classNames = [$objectType->getFullyQualifiedName()];
} else {
/** @var array<class-string> $classNames */
$classNames = TypeUtils::getDirectClassNames($objectType);
}
$methodName = $this->nodeNameResolver->getName($staticCall->name);
if ($methodName === null) {
return null;

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

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