octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-08 20:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 18af399494c5de1d75db67782cad566e65b534bb

Browse Source 
18af399494 Drop AttributeKey::SCOPE in FuncCallStaticCallToMethodCallAnalyzer (#3807)
This commit is contained in:
Tomas Votruba 2023-05-11 19:57:34 +00:00
parent f49ec8a9f1
commit 6401ff0114
8 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rules/Transform/NodeAnalyzer/FuncCallStaticCallToMethodCallAnalyzer.php
View File

@ -10,6 +10,7 @@ use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PHPStan\Analyser\Scope;
use PHPStan\Type\ObjectType;
use Rector\Core\PhpParser\Node\NodeFactory;
use Rector\Naming\Naming\PropertyNaming;
@ -62,9 +63,9 @@ final class FuncCallStaticCallToMethodCallAnalyzer
/**
* @return \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\PropertyFetch|\PhpParser\Node\Expr\Variable
*/
public function matchTypeProvidingExpr(Class_ $class, ClassMethod $classMethod, ObjectType $objectType)
public function matchTypeProvidingExpr(Class_ $class, ClassMethod $classMethod, ObjectType $objectType, Scope $scope)
{
$expr = $this->typeProvidingExprFromClassResolver->resolveTypeProvidingExprFromClass($class, $classMethod, $objectType);
$expr = $this->typeProvidingExprFromClassResolver->resolveTypeProvidingExprFromClass($class, $classMethod, $objectType, $scope);
if ($expr instanceof Expr) {
if ($expr instanceof Variable) {
$this->addClassMethodParamForVariable($expr, $objectType, $classMethod);

6
rules/Transform/NodeTypeAnalyzer/TypeProvidingExprFromClassResolver.php
View File

@ -50,7 +50,7 @@ final class TypeProvidingExprFromClassResolver
/**
* @return MethodCall|PropertyFetch|Variable|null
*/
public function resolveTypeProvidingExprFromClass(Class_ $class, ClassMethod $classMethod, ObjectType $objectType) : ?Expr
public function resolveTypeProvidingExprFromClass(Class_ $class, ClassMethod $classMethod, ObjectType $objectType, Scope $scope) : ?Expr
{
$className = (string) $this->nodeNameResolver->getName($class);
// A. match a method
@ -60,10 +60,6 @@ final class TypeProvidingExprFromClassResolver
return $methodCallProvidingType;
}
// B. match existing property
$scope = $class->getAttribute(AttributeKey::SCOPE);
if (!$scope instanceof Scope) {
return null;
}
$propertyFetch = $this->resolvePropertyFetchProvidingType($classReflection, $scope, $objectType);
if ($propertyFetch instanceof PropertyFetch) {
return $propertyFetch;

8
rules/Transform/Rector/FuncCall/FuncCallToMethodCallRector.php
View File

@ -7,8 +7,10 @@ use PhpParser\Node;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PHPStan\Analyser\Scope;
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\Rector\AbstractScopeAwareRector;
use Rector\Transform\NodeAnalyzer\FuncCallStaticCallToMethodCallAnalyzer;
use Rector\Transform\ValueObject\FuncCallToMethodCall;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
@ -17,7 +19,7 @@ use RectorPrefix202305\Webmozart\Assert\Assert;
/**
* @see \Rector\Tests\Transform\Rector\FuncCall\FuncCallToMethodCallRector\FuncCallToMethodCallRectorTest
*/
final class FuncCallToMethodCallRector extends AbstractRector implements ConfigurableRectorInterface
final class FuncCallToMethodCallRector extends AbstractScopeAwareRector implements ConfigurableRectorInterface
{
/**
* @var FuncCallToMethodCall[]
@ -74,7 +76,7 @@ CODE_SAMPLE
/**
* @param FuncCall $node
*/
public function refactor(Node $node) : ?Node
public function refactorWithScope(Node $node, Scope $scope) : ?Node
{
$classLike = $this->betterNodeFinder->findParentType($node, Class_::class);
if (!$classLike instanceof Class_) {
@ -91,7 +93,7 @@ CODE_SAMPLE
if (!$this->isName($node->name, $funcNameToMethodCallName->getOldFuncName())) {
continue;
}
$expr = $this->funcCallStaticCallToMethodCallAnalyzer->matchTypeProvidingExpr($classLike, $classMethod, $funcNameToMethodCallName->getNewObjectType());
$expr = $this->funcCallStaticCallToMethodCallAnalyzer->matchTypeProvidingExpr($classLike, $classMethod, $funcNameToMethodCallName->getNewObjectType(), $scope);
return $this->nodeFactory->createMethodCall($expr, $funcNameToMethodCallName->getNewMethodName(), $node->args);
}
return null;

8
rules/Transform/Rector/StaticCall/StaticCallToMethodCallRector.php
View File

@ -10,9 +10,11 @@ use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PHPStan\Analyser\Scope;
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\Rector\AbstractScopeAwareRector;
use Rector\Transform\NodeAnalyzer\FuncCallStaticCallToMethodCallAnalyzer;
use Rector\Transform\ValueObject\StaticCallToMethodCall;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
@ -21,7 +23,7 @@ use RectorPrefix202305\Webmozart\Assert\Assert;
/**
* @see \Rector\Tests\Transform\Rector\StaticCall\StaticCallToMethodCallRector\StaticCallToMethodCallRectorTest
*/
final class StaticCallToMethodCallRector extends AbstractRector implements ConfigurableRectorInterface
final class StaticCallToMethodCallRector extends AbstractScopeAwareRector implements ConfigurableRectorInterface
{
/**
* @var StaticCallToMethodCall[]
@ -82,7 +84,7 @@ CODE_SAMPLE
/**
* @param StaticCall $node
*/
public function refactor(Node $node) : ?Node
public function refactorWithScope(Node $node, Scope $scope) : ?Node
{
$classLike = $this->betterNodeFinder->findParentType($node, Class_::class);
if (!$classLike instanceof Class_) {
@ -99,7 +101,7 @@ CODE_SAMPLE
if ($classMethod->isStatic()) {
return $this->refactorToInstanceCall($node, $staticCallToMethodCall);
}
$expr = $this->funcCallStaticCallToMethodCallAnalyzer->matchTypeProvidingExpr($classLike, $classMethod, $staticCallToMethodCall->getClassObjectType());
$expr = $this->funcCallStaticCallToMethodCallAnalyzer->matchTypeProvidingExpr($classLike, $classMethod, $staticCallToMethodCall->getClassObjectType(), $scope);
if ($staticCallToMethodCall->getMethodName() === '*') {
$methodName = $this->getName($node->name);
} else {

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'dd970ac29023b0e6e27f54d79d98cf7415a638c5';
public const PACKAGE_VERSION = '18af399494c5de1d75db67782cad566e65b534bb';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-11 19:33:06';
public const RELEASE_DATE = '2023-05-11 19:53:44';
/**
* @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 ComposerAutoloaderInitbf976720b7dcdf0b522d9622e6b2dff9::getLoader();
return ComposerAutoloaderInitd426891379f8d592ae6e0254d2d1a898::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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