Skip to content

Commit ebbf202

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit 3d165eb8ef551c6a3912bc664f5255ee572b3235
rectorphp/rector-src@3d165eb [NodeTypeResolver] Remove unneded ReflectionProvider usage on StaticCallMethodCallTypeResolver (#4372)
1 parent a890ca9 commit ebbf202

5 files changed

Lines changed: 17 additions & 27 deletions

File tree

‎packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
use PhpParser\Node\Expr\MethodCall;
88
use PhpParser\Node\Expr\StaticCall;
99
use PHPStan\Analyser\Scope;
10+
use PHPStan\Reflection\ClassReflection;
1011
use PHPStan\Reflection\Php\PhpMethodReflection;
11-
use PHPStan\Reflection\ReflectionProvider;
1212
use PHPStan\Type\MixedType;
1313
use PHPStan\Type\Type;
1414
use Rector\NodeNameResolver\NodeNameResolver;
@@ -27,19 +27,13 @@ final class StaticCallMethodCallTypeResolver implements NodeTypeResolverInterfac
2727
* @var \Rector\NodeNameResolver\NodeNameResolver
2828
*/
2929
private $nodeNameResolver;
30-
/**
31-
* @readonly
32-
* @var \PHPStan\Reflection\ReflectionProvider
33-
*/
34-
private $reflectionProvider;
3530
/**
3631
* @var \Rector\NodeTypeResolver\NodeTypeResolver
3732
*/
3833
private $nodeTypeResolver;
39-
public function __construct(NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider)
34+
public function __construct(NodeNameResolver $nodeNameResolver)
4035
{
4136
$this->nodeNameResolver = $nodeNameResolver;
42-
$this->reflectionProvider = $reflectionProvider;
4337
}
4438
/**
4539
* @required
@@ -78,8 +72,8 @@ public function resolve(Node $node) : Type
7872
} else {
7973
$callerType = $this->nodeTypeResolver->getType($node->class);
8074
}
81-
foreach ($callerType->getReferencedClasses() as $referencedClass) {
82-
$classMethodReturnType = $this->resolveClassMethodReturnType($referencedClass, $node, $methodName, $scope);
75+
foreach ($callerType->getObjectClassReflections() as $classReflection) {
76+
$classMethodReturnType = $this->resolveClassMethodReturnType($classReflection, $node, $methodName, $scope);
8377
if (!$classMethodReturnType instanceof MixedType) {
8478
return $classMethodReturnType;
8579
}
@@ -89,12 +83,8 @@ public function resolve(Node $node) : Type
8983
/**
9084
* @param \PhpParser\Node\Expr\StaticCall|\PhpParser\Node\Expr\MethodCall $node
9185
*/
92-
private function resolveClassMethodReturnType(string $referencedClass, $node, string $methodName, Scope $scope) : Type
86+
private function resolveClassMethodReturnType(ClassReflection $classReflection, $node, string $methodName, Scope $scope) : Type
9387
{
94-
if (!$this->reflectionProvider->hasClass($referencedClass)) {
95-
return new MixedType();
96-
}
97-
$classReflection = $this->reflectionProvider->getClass($referencedClass);
9888
foreach ($classReflection->getAncestors() as $ancestorClassReflection) {
9989
if (!$ancestorClassReflection->hasMethod($methodName)) {
10090
continue;

‎src/Application/VersionResolver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = '7ee89b326702a0b51e3165fc478615834de50fe1';
22+
public const PACKAGE_VERSION = '3d165eb8ef551c6a3912bc664f5255ee572b3235';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2023-06-28 23:11:18';
27+
public const RELEASE_DATE = '2023-06-29 00:00:16';
2828
/**
2929
* @var int
3030
*/

‎vendor/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

2323
require_once __DIR__ . '/composer/autoload_real.php';
2424

25-
return ComposerAutoloaderInit9f6c5876faf703862369649ae70309a3::getLoader();
25+
return ComposerAutoloaderInitf133d4f5a8838c5c2354cbb64e7a1020::getLoader();

‎vendor/composer/autoload_real.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInit9f6c5876faf703862369649ae70309a3
5+
class ComposerAutoloaderInitf133d4f5a8838c5c2354cbb64e7a1020
66
{
77
private static $loader;
88

@@ -22,17 +22,17 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25-
spl_autoload_register(array('ComposerAutoloaderInit9f6c5876faf703862369649ae70309a3', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInitf133d4f5a8838c5c2354cbb64e7a1020', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInit9f6c5876faf703862369649ae70309a3', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInitf133d4f5a8838c5c2354cbb64e7a1020', 'loadClassLoader'));
2828

2929
require __DIR__ . '/autoload_static.php';
30-
call_user_func(\Composer\Autoload\ComposerStaticInit9f6c5876faf703862369649ae70309a3::getInitializer($loader));
30+
call_user_func(\Composer\Autoload\ComposerStaticInitf133d4f5a8838c5c2354cbb64e7a1020::getInitializer($loader));
3131

3232
$loader->setClassMapAuthoritative(true);
3333
$loader->register(true);
3434

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInit9f6c5876faf703862369649ae70309a3::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInitf133d4f5a8838c5c2354cbb64e7a1020::$files;
3636
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3737
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3838
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

‎vendor/composer/autoload_static.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInit9f6c5876faf703862369649ae70309a3
7+
class ComposerStaticInitf133d4f5a8838c5c2354cbb64e7a1020
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3098,9 +3098,9 @@ class ComposerStaticInit9f6c5876faf703862369649ae70309a3
30983098
public static function getInitializer(ClassLoader $loader)
30993099
{
31003100
return \Closure::bind(function () use ($loader) {
3101-
$loader->prefixLengthsPsr4 = ComposerStaticInit9f6c5876faf703862369649ae70309a3::$prefixLengthsPsr4;
3102-
$loader->prefixDirsPsr4 = ComposerStaticInit9f6c5876faf703862369649ae70309a3::$prefixDirsPsr4;
3103-
$loader->classMap = ComposerStaticInit9f6c5876faf703862369649ae70309a3::$classMap;
3101+
$loader->prefixLengthsPsr4 = ComposerStaticInitf133d4f5a8838c5c2354cbb64e7a1020::$prefixLengthsPsr4;
3102+
$loader->prefixDirsPsr4 = ComposerStaticInitf133d4f5a8838c5c2354cbb64e7a1020::$prefixDirsPsr4;
3103+
$loader->classMap = ComposerStaticInitf133d4f5a8838c5c2354cbb64e7a1020::$classMap;
31043104

31053105
}, null, ClassLoader::class);
31063106
}

0 commit comments

Comments
 (0)