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

Updated Rector to commit 205e7a5bd0

Browse Source 
205e7a5bd0 [Core] Move isPropertyFetch() to PropertyFetchAnalyzer (#563)
This commit is contained in:
Tomas Votruba 2021-08-01 16:59:22 +00:00
parent c512faabc2
commit b0f145ae07
8 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php
View File

@ -21,7 +21,6 @@ use Rector\Core\Rector\AbstractRector;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Php80\NodeAnalyzer\PromotedPropertyResolver;
use Rector\TypeDeclaration\AlreadyAssignDetector\ConstructorAssignDetector;
use Rector\TypeDeclaration\Matcher\PropertyAssignMatcher;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -45,17 +44,12 @@ final class RemoveDeadInstanceOfRector extends \Rector\Core\Rector\AbstractRecto
* @var \Rector\Php80\NodeAnalyzer\PromotedPropertyResolver
*/
private $promotedPropertyResolver;
/**
* @var \Rector\TypeDeclaration\Matcher\PropertyAssignMatcher
*/
private $propertyAssignMatcher;
public function __construct(\Rector\Core\NodeManipulator\IfManipulator $ifManipulator, \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer $propertyFetchAnalyzer, \Rector\TypeDeclaration\AlreadyAssignDetector\ConstructorAssignDetector $constructorAssignDetector, \Rector\Php80\NodeAnalyzer\PromotedPropertyResolver $promotedPropertyResolver, \Rector\TypeDeclaration\Matcher\PropertyAssignMatcher $propertyAssignMatcher)
public function __construct(\Rector\Core\NodeManipulator\IfManipulator $ifManipulator, \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer $propertyFetchAnalyzer, \Rector\TypeDeclaration\AlreadyAssignDetector\ConstructorAssignDetector $constructorAssignDetector, \Rector\Php80\NodeAnalyzer\PromotedPropertyResolver $promotedPropertyResolver)
{
$this->ifManipulator = $ifManipulator;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
$this->constructorAssignDetector = $constructorAssignDetector;
$this->promotedPropertyResolver = $promotedPropertyResolver;
$this->propertyAssignMatcher = $propertyAssignMatcher;
}
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
@ -133,7 +127,7 @@ CODE_SAMPLE
}
private function isSkippedPropertyFetch(\PhpParser\Node\Expr $expr) : bool
{
if (!$this->propertyAssignMatcher->isPropertyFetch($expr)) {
if (!$this->propertyFetchAnalyzer->isPropertyFetch($expr)) {
return \true;
}
/** @var PropertyFetch|StaticPropertyFetch $propertyFetch */

22
rules/TypeDeclaration/Matcher/PropertyAssignMatcher.php
View File

@ -3,12 +3,10 @@
declare (strict_types=1);
namespace Rector\TypeDeclaration\Matcher;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticPropertyFetch;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\NodeNameResolver\NodeNameResolver;
final class PropertyAssignMatcher
{
@ -16,9 +14,14 @@ final class PropertyAssignMatcher
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver)
/**
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
*/
private $propertyFetchAnalyzer;
public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer $propertyFetchAnalyzer)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
}
/**
* Covers:
@ -27,13 +30,13 @@ final class PropertyAssignMatcher
*/
public function matchPropertyAssignExpr(\PhpParser\Node\Expr\Assign $assign, string $propertyName) : ?\PhpParser\Node\Expr
{
if ($this->isPropertyFetch($assign->var)) {
if ($this->propertyFetchAnalyzer->isPropertyFetch($assign->var)) {
if (!$this->nodeNameResolver->isName($assign->var, $propertyName)) {
return null;
}
return $assign->expr;
}
if ($assign->var instanceof \PhpParser\Node\Expr\ArrayDimFetch && $this->isPropertyFetch($assign->var->var)) {
if ($assign->var instanceof \PhpParser\Node\Expr\ArrayDimFetch && $this->propertyFetchAnalyzer->isPropertyFetch($assign->var->var)) {
if (!$this->nodeNameResolver->isName($assign->var->var, $propertyName)) {
return null;
}
@ -41,11 +44,4 @@ final class PropertyAssignMatcher
}
return null;
}
public function isPropertyFetch(\PhpParser\Node $node) : bool
{
if ($node instanceof \PhpParser\Node\Expr\PropertyFetch) {
return \true;
}
return $node instanceof \PhpParser\Node\Expr\StaticPropertyFetch;
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '00015a4390ff1ee82930374b286d1053569d9580';
public const PACKAGE_VERSION = '205e7a5bd026cdbbeac19bc51e63e429ee2df704';
/**
* @var string
*/
public const RELEASE_DATE = '2021-08-01 18:48:04';
public const RELEASE_DATE = '2021-08-01 18:48:35';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210801\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

7
src/NodeAnalyzer/PropertyFetchAnalyzer.php
View File

@ -92,6 +92,13 @@ final class PropertyFetchAnalyzer
}
return \false;
}
public function isPropertyFetch(\PhpParser\Node $node) : bool
{
if ($node instanceof \PhpParser\Node\Expr\PropertyFetch) {
return \true;
}
return $node instanceof \PhpParser\Node\Expr\StaticPropertyFetch;
}
/**
* Matches:
* "$this->someValue = $<variableName>;"

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit1ed3c3c61a460fb7b361c0abc2259dce::getLoader();
return ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit1ed3c3c61a460fb7b361c0abc2259dce
class ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit1ed3c3c61a460fb7b361c0abc2259dce
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit1ed3c3c61a460fb7b361c0abc2259dce', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit1ed3c3c61a460fb7b361c0abc2259dce', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit1ed3c3c61a460fb7b361c0abc2259dce::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit1ed3c3c61a460fb7b361c0abc2259dce
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit1ed3c3c61a460fb7b361c0abc2259dce::$files;
$includeFiles = Composer\Autoload\ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire1ed3c3c61a460fb7b361c0abc2259dce($fileIdentifier, $file);
composerRequiree1c07f26c3e751a7d1dd1280d800dd4b($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire1ed3c3c61a460fb7b361c0abc2259dce($fileIdentifier, $file)
function composerRequiree1c07f26c3e751a7d1dd1280d800dd4b($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit1ed3c3c61a460fb7b361c0abc2259dce
class ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3850,9 +3850,9 @@ class ComposerStaticInit1ed3c3c61a460fb7b361c0abc2259dce
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit1ed3c3c61a460fb7b361c0abc2259dce::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit1ed3c3c61a460fb7b361c0abc2259dce::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit1ed3c3c61a460fb7b361c0abc2259dce::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20210801\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit1ed3c3c61a460fb7b361c0abc2259dce', false) && !interface_exists('ComposerAutoloaderInit1ed3c3c61a460fb7b361c0abc2259dce', false) && !trait_exists('ComposerAutoloaderInit1ed3c3c61a460fb7b361c0abc2259dce', false)) {
spl_autoload_call('RectorPrefix20210801\ComposerAutoloaderInit1ed3c3c61a460fb7b361c0abc2259dce');
if (!class_exists('ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b', false) && !interface_exists('ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b', false) && !trait_exists('ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b', false)) {
spl_autoload_call('RectorPrefix20210801\ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210801\Doctrine\Inflector\Inflector');
@ -3308,9 +3308,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210801\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire1ed3c3c61a460fb7b361c0abc2259dce')) {
function composerRequire1ed3c3c61a460fb7b361c0abc2259dce() {
return \RectorPrefix20210801\composerRequire1ed3c3c61a460fb7b361c0abc2259dce(...func_get_args());
if (!function_exists('composerRequiree1c07f26c3e751a7d1dd1280d800dd4b')) {
function composerRequiree1c07f26c3e751a7d1dd1280d800dd4b() {
return \RectorPrefix20210801\composerRequiree1c07f26c3e751a7d1dd1280d800dd4b(...func_get_args());
}
}
if (!function_exists('parseArgs')) {