mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-03-14 12:29:43 +01:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit a1faa32b17ba822f12fe4297c9928ffdb1725a56

Browse Source 
a1faa32b17 [Privatization] Allow constant only if inside array on ChangeReadOnlyVariableWithDefaultValueToConstantRector (#1895)
This commit is contained in:
Tomas Votruba 2022-03-03 06:53:03 +00:00
parent acd3eb894c
commit 1f89fb5963
6 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '8baf876ad2dcbe0c5d2d555576b0b3293ef39f1a';
public const PACKAGE_VERSION = 'a1faa32b17ba822f12fe4297c9928ffdb1725a56';
/**
* @var string
*/
public const RELEASE_DATE = '2022-03-03 05:19:30';
public const RELEASE_DATE = '2022-03-03 13:45:58';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20220303\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

17
src/NodeManipulator/VariableManipulator.php
View File

@ -7,6 +7,8 @@ use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\ClassConstFetch;
use PhpParser\Node\Expr\ConstFetch;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Scalar\Encapsed;
use PhpParser\Node\Scalar\EncapsedStringPart;
@ -15,6 +17,7 @@ use PhpParser\Node\Stmt\ClassMethod;
use Rector\Core\NodeAnalyzer\ExprAnalyzer;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\PhpParser\Node\Value\ValueResolver;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\ReadWrite\Guard\VariableToConstantGuard;
@ -56,7 +59,12 @@ final class VariableManipulator
* @var \Rector\Core\NodeAnalyzer\ExprAnalyzer
*/
private $exprAnalyzer;
public function __construct(\Rector\Core\NodeManipulator\AssignManipulator $assignManipulator, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \RectorPrefix20220303\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\ReadWrite\Guard\VariableToConstantGuard $variableToConstantGuard, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator, \Rector\Core\NodeAnalyzer\ExprAnalyzer $exprAnalyzer)
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\Value\ValueResolver
*/
private $valueResolver;
public function __construct(\Rector\Core\NodeManipulator\AssignManipulator $assignManipulator, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \RectorPrefix20220303\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\ReadWrite\Guard\VariableToConstantGuard $variableToConstantGuard, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator, \Rector\Core\NodeAnalyzer\ExprAnalyzer $exprAnalyzer, \Rector\Core\PhpParser\Node\Value\ValueResolver $valueResolver)
{
$this->assignManipulator = $assignManipulator;
$this->betterNodeFinder = $betterNodeFinder;
@ -65,6 +73,7 @@ final class VariableManipulator
$this->variableToConstantGuard = $variableToConstantGuard;
$this->nodeComparator = $nodeComparator;
$this->exprAnalyzer = $exprAnalyzer;
$this->valueResolver = $valueResolver;
}
/**
* @return Assign[]
@ -88,6 +97,12 @@ final class VariableManipulator
if ($this->isTestCaseExpectedVariable($node->var)) {
return null;
}
if ($node->expr instanceof \PhpParser\Node\Expr\ConstFetch || $node->expr instanceof \PhpParser\Node\Expr\ClassConstFetch) {
$value = $this->valueResolver->getValue($node->expr);
if (!\is_array($value)) {
return null;
}
}
$assignsOfArrayToVariable[] = $node;
});
return $assignsOfArrayToVariable;

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitda5fcfc8e59e066963d66ae8fcb65157
class ComposerAutoloaderInit4185125407a6118e02d9aceddf281561
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitda5fcfc8e59e066963d66ae8fcb65157
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitda5fcfc8e59e066963d66ae8fcb65157', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit4185125407a6118e02d9aceddf281561', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitda5fcfc8e59e066963d66ae8fcb65157', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit4185125407a6118e02d9aceddf281561', '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\ComposerStaticInitda5fcfc8e59e066963d66ae8fcb65157::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit4185125407a6118e02d9aceddf281561::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,12 +42,12 @@ class ComposerAutoloaderInitda5fcfc8e59e066963d66ae8fcb65157
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitda5fcfc8e59e066963d66ae8fcb65157::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit4185125407a6118e02d9aceddf281561::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequireda5fcfc8e59e066963d66ae8fcb65157($fileIdentifier, $file);
composerRequire4185125407a6118e02d9aceddf281561($fileIdentifier, $file);
}
return $loader;
@ -59,7 +59,7 @@ class ComposerAutoloaderInitda5fcfc8e59e066963d66ae8fcb65157
* @param string $file
* @return void
*/
function composerRequireda5fcfc8e59e066963d66ae8fcb65157($fileIdentifier, $file)
function composerRequire4185125407a6118e02d9aceddf281561($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 ComposerStaticInitda5fcfc8e59e066963d66ae8fcb65157
class ComposerStaticInit4185125407a6118e02d9aceddf281561
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -3848,9 +3848,9 @@ class ComposerStaticInitda5fcfc8e59e066963d66ae8fcb65157
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitda5fcfc8e59e066963d66ae8fcb65157::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitda5fcfc8e59e066963d66ae8fcb65157::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitda5fcfc8e59e066963d66ae8fcb65157::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit4185125407a6118e02d9aceddf281561::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit4185125407a6118e02d9aceddf281561::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit4185125407a6118e02d9aceddf281561::$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('RectorPrefix20220303\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitda5fcfc8e59e066963d66ae8fcb65157', false) && !interface_exists('ComposerAutoloaderInitda5fcfc8e59e066963d66ae8fcb65157', false) && !trait_exists('ComposerAutoloaderInitda5fcfc8e59e066963d66ae8fcb65157', false)) {
spl_autoload_call('RectorPrefix20220303\ComposerAutoloaderInitda5fcfc8e59e066963d66ae8fcb65157');
if (!class_exists('ComposerAutoloaderInit4185125407a6118e02d9aceddf281561', false) && !interface_exists('ComposerAutoloaderInit4185125407a6118e02d9aceddf281561', false) && !trait_exists('ComposerAutoloaderInit4185125407a6118e02d9aceddf281561', false)) {
spl_autoload_call('RectorPrefix20220303\ComposerAutoloaderInit4185125407a6118e02d9aceddf281561');
}
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('RectorPrefix20220303\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220303\print_node(...func_get_args());
}
}
if (!function_exists('composerRequireda5fcfc8e59e066963d66ae8fcb65157')) {
function composerRequireda5fcfc8e59e066963d66ae8fcb65157() {
return \RectorPrefix20220303\composerRequireda5fcfc8e59e066963d66ae8fcb65157(...func_get_args());
if (!function_exists('composerRequire4185125407a6118e02d9aceddf281561')) {
function composerRequire4185125407a6118e02d9aceddf281561() {
return \RectorPrefix20220303\composerRequire4185125407a6118e02d9aceddf281561(...func_get_args());
}
}
if (!function_exists('scanPath')) {