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

Updated Rector to commit 366c994a5c

Browse Source 
366c994a5c More current statement attribute clean up (#2150)
This commit is contained in:
Tomas Votruba 2022-04-24 17:30:55 +00:00
parent b739fa46b8
commit 19e48f49f2
14 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/BetterPhpDocParser/PhpDocManipulator/VarAnnotationManipulator.php
View File

@ -12,7 +12,7 @@ use PHPStan\Type\TypeWithClassName;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\BetterPhpDocParser\ValueObject\Type\FullyQualifiedIdentifierTypeNode;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
final class VarAnnotationManipulator
{
/**
@ -25,10 +25,16 @@ final class VarAnnotationManipulator
* @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger
*/
private $phpDocTypeChanger;
public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger $phpDocTypeChanger)
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger $phpDocTypeChanger, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder)
{
$this->phpDocInfoFactory = $phpDocInfoFactory;
$this->phpDocTypeChanger = $phpDocTypeChanger;
$this->betterNodeFinder = $betterNodeFinder;
}
public function decorateNodeWithInlineVarType(\PhpParser\Node $node, \PHPStan\Type\TypeWithClassName $typeWithClassName, string $variableName) : void
{
@ -52,7 +58,7 @@ final class VarAnnotationManipulator
}
private function resolvePhpDocInfo(\PhpParser\Node $node) : \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo
{
$currentStmt = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CURRENT_STATEMENT);
$currentStmt = $this->betterNodeFinder->resolveCurrentStatement($node);
if ($currentStmt instanceof \PhpParser\Node\Stmt\Expression) {
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($currentStmt);
} else {

15
packages/NodeRemoval/AssignRemover.php
View File

@ -4,8 +4,10 @@ declare (strict_types=1);
namespace Rector\NodeRemoval;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Expression;
use Rector\ChangesReporting\Collector\RectorChangeCollector;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\DeadCode\NodeManipulator\LivingCodeManipulator;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\PostRector\Collector\NodesToReplaceCollector;
@ -31,16 +33,25 @@ final class AssignRemover
* @var \Rector\DeadCode\NodeManipulator\LivingCodeManipulator
*/
private $livingCodeManipulator;
public function __construct(\Rector\PostRector\Collector\NodesToReplaceCollector $nodesToReplaceCollector, \Rector\ChangesReporting\Collector\RectorChangeCollector $rectorChangeCollector, \Rector\NodeRemoval\NodeRemover $nodeRemover, \Rector\DeadCode\NodeManipulator\LivingCodeManipulator $livingCodeManipulator)
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(\Rector\PostRector\Collector\NodesToReplaceCollector $nodesToReplaceCollector, \Rector\ChangesReporting\Collector\RectorChangeCollector $rectorChangeCollector, \Rector\NodeRemoval\NodeRemover $nodeRemover, \Rector\DeadCode\NodeManipulator\LivingCodeManipulator $livingCodeManipulator, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder)
{
$this->nodesToReplaceCollector = $nodesToReplaceCollector;
$this->rectorChangeCollector = $rectorChangeCollector;
$this->nodeRemover = $nodeRemover;
$this->livingCodeManipulator = $livingCodeManipulator;
$this->betterNodeFinder = $betterNodeFinder;
}
public function removeAssignNode(\PhpParser\Node\Expr\Assign $assign) : void
{
$currentStatement = $assign->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CURRENT_STATEMENT);
$currentStatement = $this->betterNodeFinder->resolveCurrentStatement($assign);
if (!$currentStatement instanceof \PhpParser\Node\Stmt) {
return;
}
$this->livingCodeManipulator->addLivingCodeBeforeNode($assign->var, $currentStatement);
/** @var Assign $assign */
$parent = $assign->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::PARENT_NODE);

2
packages/PostRector/Collector/NodesToAddCollector.php
View File

@ -123,7 +123,7 @@ final class NodesToAddCollector implements \Rector\PostRector\Contract\Collector
if ($node instanceof \PhpParser\Node\Stmt) {
return \spl_object_hash($node);
}
$currentStmt = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CURRENT_STATEMENT);
$currentStmt = $this->betterNodeFinder->resolveCurrentStatement($node);
if ($currentStmt instanceof \PhpParser\Node\Stmt) {
return \spl_object_hash($currentStmt);
}

6
rules/CodeQuality/Rector/FuncCall/CompactToVariablesRector.php
View File

@ -9,6 +9,7 @@ use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Array_;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Stmt;
use PHPStan\Analyser\Scope;
use PHPStan\Type\Constant\ConstantArrayType;
use PHPStan\Type\MixedType;
@ -115,6 +116,10 @@ CODE_SAMPLE
if (!$assignScope instanceof \PHPStan\Analyser\Scope) {
return null;
}
$currentStatement = $this->betterNodeFinder->resolveCurrentStatement($funcCall);
if (!$currentStatement instanceof \PhpParser\Node\Stmt) {
return null;
}
$isCompactOfUndefinedVariables = $this->arrayItemsAnalyzer->hasArrayExclusiveDefinedVariableNames($array, $assignScope);
if ($isCompactOfUndefinedVariables) {
$funcCallScope = $funcCall->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE);
@ -133,7 +138,6 @@ CODE_SAMPLE
$firstArg = $funcCall->args[0];
$assignVariable = $firstArg->value;
$preAssign = new \PhpParser\Node\Expr\Assign($assignVariable, $array);
$currentStatement = $funcCall->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CURRENT_STATEMENT);
$this->nodesToAddCollector->addNodeBeforeNode($preAssign, $currentStatement);
return $expr;
}

2
rules/CodingStyle/Rector/Assign/PHPStormVarAnnotationRector.php
View File

@ -60,7 +60,7 @@ CODE_SAMPLE
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
$expression = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CURRENT_STATEMENT);
$expression = $this->betterNodeFinder->resolveCurrentStatement($node);
// unable to analyze
if (!$expression instanceof \PhpParser\Node\Stmt\Expression) {
return null;

2
rules/Naming/VariableRenamer.php
View File

@ -117,7 +117,7 @@ final class VariableRenamer
*/
private function resolvePhpDocInfo(\PhpParser\Node\Expr\Variable $variable) : \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo
{
$expression = $variable->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CURRENT_STATEMENT);
$expression = $this->betterNodeFinder->resolveCurrentStatement($variable);
if ($expression instanceof \PhpParser\Node) {
return $this->phpDocInfoFactory->createFromNodeOrEmpty($expression);
}

10
rules/Php70/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php
View File

@ -17,11 +17,11 @@ use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Namespace_;
use PhpParser\Node\Stmt\Return_;
use PHPStan\Analyser\MutatingScope;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\ParameterReflection;
@ -108,9 +108,11 @@ final class NonVariableToVariableOnFunctionCallRector extends \Rector\Core\Recto
continue;
}
$replacements = $this->getReplacementsFor($argument, $currentScope, $scopeNode);
$current = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CURRENT_STATEMENT);
$currentStatement = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CURRENT_STATEMENT);
$this->nodesToAddCollector->addNodeBeforeNode($replacements->getAssign(), $current instanceof \PhpParser\Node\Stmt\Return_ ? $current : $currentStatement);
$currentStatement = $this->betterNodeFinder->resolveCurrentStatement($node);
if (!$currentStatement instanceof \PhpParser\Node\Stmt) {
continue;
}
$this->nodesToAddCollector->addNodeBeforeNode($replacements->getAssign(), $currentStatement);
$node->args[$key]->value = $replacements->getVariable();
// add variable name to scope, so we prevent duplication of new variable of the same name
$currentScope = $currentScope->assignExpression($replacements->getVariable(), $currentScope->getType($replacements->getVariable()));

2
rules/Php72/Rector/FuncCall/ParseStrWithResultArgumentRector.php
View File

@ -57,7 +57,7 @@ CODE_SAMPLE
}
$resultVariable = new \PhpParser\Node\Expr\Variable('result');
$node->args[1] = new \PhpParser\Node\Arg($resultVariable);
$expression = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CURRENT_STATEMENT);
$expression = $this->betterNodeFinder->resolveCurrentStatement($node);
if (!$expression instanceof \PhpParser\Node\Stmt) {
return null;
}

2
rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php
View File

@ -116,7 +116,7 @@ CODE_SAMPLE
}
private function getNextExpression(\PhpParser\Node\Expr\FuncCall $funcCall) : ?\PhpParser\Node
{
$currentExpression = $funcCall->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CURRENT_STATEMENT);
$currentExpression = $this->betterNodeFinder->resolveCurrentStatement($funcCall);
if (!$currentExpression instanceof \PhpParser\Node\Stmt\Expression) {
return null;
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '0954611a38d72d74dd0c1e305019906fc05dc5f4';
public const PACKAGE_VERSION = '366c994a5c411c1c1f7d465d657ca1fe52bd90a4';
/**
* @var string
*/
public const RELEASE_DATE = '2022-04-24 16:54:56';
public const RELEASE_DATE = '2022-04-24 19:24:58';
/**
* @var string
*/

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit83d461fdbf9b02675b6ca6d968a6226f
class ComposerAutoloaderInit0bef1048332e398537a33124eb02dfd0
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit83d461fdbf9b02675b6ca6d968a6226f
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit83d461fdbf9b02675b6ca6d968a6226f', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit0bef1048332e398537a33124eb02dfd0', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit83d461fdbf9b02675b6ca6d968a6226f', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit0bef1048332e398537a33124eb02dfd0', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit83d461fdbf9b02675b6ca6d968a6226f::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit0bef1048332e398537a33124eb02dfd0::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit83d461fdbf9b02675b6ca6d968a6226f::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit0bef1048332e398537a33124eb02dfd0::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire83d461fdbf9b02675b6ca6d968a6226f($fileIdentifier, $file);
composerRequire0bef1048332e398537a33124eb02dfd0($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit83d461fdbf9b02675b6ca6d968a6226f
* @param string $file
* @return void
*/
function composerRequire83d461fdbf9b02675b6ca6d968a6226f($fileIdentifier, $file)
function composerRequire0bef1048332e398537a33124eb02dfd0($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 ComposerStaticInit83d461fdbf9b02675b6ca6d968a6226f
class ComposerStaticInit0bef1048332e398537a33124eb02dfd0
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -3871,9 +3871,9 @@ class ComposerStaticInit83d461fdbf9b02675b6ca6d968a6226f
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit83d461fdbf9b02675b6ca6d968a6226f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit83d461fdbf9b02675b6ca6d968a6226f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit83d461fdbf9b02675b6ca6d968a6226f::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit0bef1048332e398537a33124eb02dfd0::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0bef1048332e398537a33124eb02dfd0::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0bef1048332e398537a33124eb02dfd0::$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('RectorPrefix20220424\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit83d461fdbf9b02675b6ca6d968a6226f', false) && !interface_exists('ComposerAutoloaderInit83d461fdbf9b02675b6ca6d968a6226f', false) && !trait_exists('ComposerAutoloaderInit83d461fdbf9b02675b6ca6d968a6226f', false)) {
spl_autoload_call('RectorPrefix20220424\ComposerAutoloaderInit83d461fdbf9b02675b6ca6d968a6226f');
if (!class_exists('ComposerAutoloaderInit0bef1048332e398537a33124eb02dfd0', false) && !interface_exists('ComposerAutoloaderInit0bef1048332e398537a33124eb02dfd0', false) && !trait_exists('ComposerAutoloaderInit0bef1048332e398537a33124eb02dfd0', false)) {
spl_autoload_call('RectorPrefix20220424\ComposerAutoloaderInit0bef1048332e398537a33124eb02dfd0');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20220424\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220424\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire83d461fdbf9b02675b6ca6d968a6226f')) {
function composerRequire83d461fdbf9b02675b6ca6d968a6226f() {
return \RectorPrefix20220424\composerRequire83d461fdbf9b02675b6ca6d968a6226f(...func_get_args());
if (!function_exists('composerRequire0bef1048332e398537a33124eb02dfd0')) {
function composerRequire0bef1048332e398537a33124eb02dfd0() {
return \RectorPrefix20220424\composerRequire0bef1048332e398537a33124eb02dfd0(...func_get_args());
}
}
if (!function_exists('scanPath')) {