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

Updated Rector to commit c65e60f70b628fd0602a9107189a1e9b6f0d3adf

Browse Source 
c65e60f70b [Php56] Skip after infinite loop on AddDefaultValueForUndefinedVariableRector (#3390)
This commit is contained in:
Tomas Votruba 2023-02-19 14:50:05 +00:00
parent 17ffb97ef9
commit c97a6c91a3
5 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
View File

@ -11,6 +11,7 @@ use PhpParser\Node\Expr\ArrayItem;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\AssignOp;
use PhpParser\Node\Expr\BinaryOp;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\Ternary;
use PhpParser\Node\Expr\Variable;
@ -45,6 +46,7 @@ use PHPStan\Type\TypeCombinator;
use Rector\Caching\Detector\ChangedFilesDetector;
use Rector\Caching\FileSystem\DependencyResolver;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\StaticReflection\SourceLocator\RenamedClassesSourceLocator;
use Rector\Core\Util\Reflection\PrivatesAccessor;
use Rector\Core\Util\StringUtils;
@ -112,7 +114,12 @@ final class PHPStanNodeScopeResolver
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
public function __construct(ChangedFilesDetector $changedFilesDetector, DependencyResolver $dependencyResolver, NodeScopeResolver $nodeScopeResolver, ReflectionProvider $reflectionProvider, RemoveDeepChainMethodCallNodeVisitor $removeDeepChainMethodCallNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory $scopeFactory, PrivatesAccessor $privatesAccessor, RenamedClassesSourceLocator $renamedClassesSourceLocator, NodeNameResolver $nodeNameResolver)
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(ChangedFilesDetector $changedFilesDetector, DependencyResolver $dependencyResolver, NodeScopeResolver $nodeScopeResolver, ReflectionProvider $reflectionProvider, RemoveDeepChainMethodCallNodeVisitor $removeDeepChainMethodCallNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory $scopeFactory, PrivatesAccessor $privatesAccessor, RenamedClassesSourceLocator $renamedClassesSourceLocator, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder)
{
$this->changedFilesDetector = $changedFilesDetector;
$this->dependencyResolver = $dependencyResolver;
@ -123,6 +130,7 @@ final class PHPStanNodeScopeResolver
$this->privatesAccessor = $privatesAccessor;
$this->renamedClassesSourceLocator = $renamedClassesSourceLocator;
$this->nodeNameResolver = $nodeNameResolver;
$this->betterNodeFinder = $betterNodeFinder;
$this->decoratePHPStanNodeScopeResolverWithRenamedClassSourceLocator($this->nodeScopeResolver);
}
/**
@ -202,6 +210,9 @@ final class PHPStanNodeScopeResolver
/** @var MutatingScope $mutatingScope */
$mutatingScope = $this->resolveClassOrInterfaceScope($node, $mutatingScope, $isScopeRefreshing);
}
if ($node instanceof Stmt) {
$this->setChildOfUnreachableStatementNodeAttribute($node);
}
// special case for unreachable nodes
if ($node instanceof UnreachableStatementNode) {
$this->processUnreachableStatementNode($node, $filePath, $mutatingScope);
@ -211,6 +222,25 @@ final class PHPStanNodeScopeResolver
};
return $this->processNodesWithDependentFiles($filePath, $stmts, $scope, $nodeCallback);
}
private function setChildOfUnreachableStatementNodeAttribute(Stmt $stmt) : void
{
if ($stmt->getAttribute(AttributeKey::IS_UNREACHABLE) === \true) {
return;
}
$parentStmt = $stmt->getAttribute(AttributeKey::PARENT_NODE);
if (!$parentStmt instanceof Node) {
return;
}
if ($parentStmt instanceof Closure) {
$parentStmt = $this->betterNodeFinder->resolveCurrentStatement($parentStmt);
}
if (!$parentStmt instanceof Stmt) {
return;
}
if ($parentStmt->getAttribute(AttributeKey::IS_UNREACHABLE) === \true) {
$stmt->setAttribute(AttributeKey::IS_UNREACHABLE, \true);
}
}
private function processArray(Array_ $array, MutatingScope $mutatingScope) : void
{
foreach ($array->items as $arrayItem) {

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'bf7648c317c5f12bc2964de223b494dbc73b79a4';
public const PACKAGE_VERSION = 'c65e60f70b628fd0602a9107189a1e9b6f0d3adf';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-02-19 14:27:26';
public const RELEASE_DATE = '2023-02-19 21:44:51';
/**
* @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 ComposerAutoloaderInit19e7c63f146d2e9ba0d458e02c3a998f::getLoader();
return ComposerAutoloaderInit65e6c8d9a51e71816b254dc5a2b00e04::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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