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

Updated Rector to commit 2848e0d0cc5b819ba90fb1393ee2607b9eac555d

Browse Source 
2848e0d0cc [Core] Use FullyQualifiedObjectType and ThisType detection for local property fetch on PropertyFetchAnalyzer (#3172)
This commit is contained in:
Tomas Votruba 2022-12-08 10:12:10 +00:00
parent 0a53c32d58
commit 6cbbfd0d97
6 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector.php
View File

@ -4,17 +4,12 @@ declare (strict_types=1);
namespace Rector\Naming\Rector\Foreach_;
use PhpParser\Node;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\Foreach_;
use PHPStan\Type\ThisType;
use Rector\CodeQuality\NodeAnalyzer\ForeachAnalyzer;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\Rector\AbstractRector;
use Rector\Naming\ExpectedNameResolver\InflectorSingularResolver;
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -83,16 +78,11 @@ CODE_SAMPLE
*/
public function refactor(Node $node) : ?Node
{
$isPropertyFetch = $this->propertyFetchAnalyzer->isPropertyFetch($node->expr);
$isPropertyFetch = $this->propertyFetchAnalyzer->isLocalPropertyFetch($node->expr);
if (!$node->expr instanceof Variable && !$isPropertyFetch) {
return null;
}
/** @var Variable|PropertyFetch|StaticPropertyFetch $expr */
$expr = $node->expr;
if ($this->isNotCurrentClassLikePropertyFetch($expr, $isPropertyFetch)) {
return null;
}
$exprName = $this->getName($expr);
$exprName = $this->getName($node->expr);
if ($exprName === null) {
return null;
}
@ -115,24 +105,6 @@ CODE_SAMPLE
}
return $this->processRename($node, $valueVarName, $singularValueVarName);
}
/**
* @param \PhpParser\Node\Expr\PropertyFetch|\PhpParser\Node\Expr\StaticPropertyFetch|\PhpParser\Node\Expr\Variable $expr
*/
private function isNotCurrentClassLikePropertyFetch($expr, bool $isPropertyFetch) : bool
{
if (!$isPropertyFetch) {
return \false;
}
/** @var PropertyFetch|StaticPropertyFetch $expr */
$variableType = $expr instanceof PropertyFetch ? $this->nodeTypeResolver->getType($expr->var) : $this->nodeTypeResolver->getType($expr->class);
if ($variableType instanceof FullyQualifiedObjectType) {
$currentClassLike = $this->betterNodeFinder->findParentType($expr, ClassLike::class);
if ($currentClassLike instanceof ClassLike) {
return !$this->nodeNameResolver->isName($currentClassLike, $variableType->getClassName());
}
}
return !$variableType instanceof ThisType;
}
private function processRename(Foreach_ $foreach, string $valueVarName, string $singularValueVarName) : Foreach_
{
$foreach->valueVar = new Variable($singularValueVarName);

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'f8ad265fa5e4c58a4d0e973a73cac2c4e1efcb3f';
public const PACKAGE_VERSION = '2848e0d0cc5b819ba90fb1393ee2607b9eac555d';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-12-08 00:18:54';
public const RELEASE_DATE = '2022-12-08 11:06:59';
/**
* @var int
*/

56
src/NodeAnalyzer/PropertyFetchAnalyzer.php
View File

@ -19,12 +19,16 @@ use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Property;
use PhpParser\Node\Stmt\Trait_;
use PHPStan\Type\ObjectType;
use PHPStan\Type\ThisType;
use Rector\Core\Enum\ObjectReference;
use Rector\Core\PhpParser\AstResolver;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\ValueObject\MethodName;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\NodeTypeResolver;
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
final class PropertyFetchAnalyzer
{
/**
@ -51,28 +55,40 @@ final class PropertyFetchAnalyzer
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
*/
private $simpleCallableNodeTraverser;
public function __construct(NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, AstResolver $astResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
/**
* @readonly
* @var \Rector\NodeTypeResolver\NodeTypeResolver
*/
private $nodeTypeResolver;
public function __construct(NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, AstResolver $astResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeTypeResolver $nodeTypeResolver)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->betterNodeFinder = $betterNodeFinder;
$this->astResolver = $astResolver;
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
$this->nodeTypeResolver = $nodeTypeResolver;
}
public function isLocalPropertyFetch(Node $node) : bool
{
if ($node instanceof PropertyFetch) {
if (!$node->var instanceof Variable) {
return \false;
}
return $this->nodeNameResolver->isName($node->var, self::THIS);
if (!$node instanceof PropertyFetch && !$node instanceof StaticPropertyFetch) {
return \false;
}
if ($node instanceof StaticPropertyFetch) {
if (!$node->class instanceof Name) {
return \false;
}
return $this->nodeNameResolver->isNames($node->class, [ObjectReference::SELF, ObjectReference::STATIC]);
$parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
/**
* Property Fetch on Trait currently doesn't has Parent Node, so fallback to use this, self, static name instead
*/
if (!$parentNode instanceof Node) {
return $this->isTraitLocalPropertyFetch($node);
}
return \false;
$variableType = $node instanceof PropertyFetch ? $this->nodeTypeResolver->getType($node->var) : $this->nodeTypeResolver->getType($node->class);
if ($variableType instanceof FullyQualifiedObjectType) {
$currentClassLike = $this->betterNodeFinder->findParentType($node, ClassLike::class);
if ($currentClassLike instanceof ClassLike) {
return $this->nodeNameResolver->isName($currentClassLike, $variableType->getClassName());
}
return \false;
}
return $variableType instanceof ThisType;
}
public function isLocalPropertyFetchName(Node $node, string $desiredPropertyName) : bool
{
@ -190,6 +206,22 @@ final class PropertyFetchAnalyzer
/** @var PropertyFetch $expr */
return $this->nodeNameResolver->isNames($expr->name, $propertyNames);
}
private function isTraitLocalPropertyFetch(Node $node) : bool
{
if ($node instanceof PropertyFetch) {
if (!$node->var instanceof Variable) {
return \false;
}
return $this->nodeNameResolver->isName($node->var, self::THIS);
}
if ($node instanceof StaticPropertyFetch) {
if (!$node->class instanceof Name) {
return \false;
}
return $this->nodeNameResolver->isNames($node->class, [ObjectReference::SELF, ObjectReference::STATIC]);
}
return \false;
}
private function isPropertyAssignFoundInClassMethod(ClassLike $classLike, string $className, string $callerClassName, ClassMethod $classMethod, string $propertyName) : bool
{
if ($className !== $callerClassName && !$classLike instanceof Trait_) {

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

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