octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 3ed219bb2fb0f598e09ecc061655a97f28a77454 

3ed219bb2f [Php71] Add Closure support on AssignArrayToStringRector (#4303)
This commit is contained in:
Tomas Votruba 2023-06-20 09:52:55 +00:00
parent 0b8bae3feb
commit 3c275c29fd
5 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rules/Php71/Rector/Assign/AssignArrayToStringRector.php
View File

@ -8,6 +8,7 @@ use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Array_;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt\Class_;
@ -15,6 +16,7 @@ use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Namespace_;
use PhpParser\Node\Stmt\Property;
use PhpParser\NodeTraverser;
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
use Rector\Core\PhpParser\NodeFinder\PropertyFetchFinder;
use Rector\Core\Rector\AbstractRector;
@ -59,18 +61,24 @@ CODE_SAMPLE
*/
public function getNodeTypes() : array
{
return [Namespace_::class, FileWithoutNamespace::class, ClassMethod::class, Function_::class];
return [Namespace_::class, FileWithoutNamespace::class, Class_::class, ClassMethod::class, Function_::class, Closure::class];
}
/**
* @param Namespace_|FileWithoutNamespace|ClassMethod|Function_ $node
* @param Namespace_|FileWithoutNamespace|Class_|ClassMethod|Function_|Closure $node
*/
public function refactor(Node $node) : ?Node
{
if ($node instanceof Class_) {
return $this->refactorClass($node);
}
if ($node->stmts === null) {
return null;
}
$hasChanged = \false;
$this->traverseNodesWithCallable($node->stmts, function (Node $subNode) use(&$hasChanged, $node) : ?int {
if ($subNode instanceof Class_ || $subNode instanceof Function_ || $subNode instanceof Closure) {
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
}
if ($subNode instanceof Assign) {
$assign = $this->refactorAssign($subNode, $node);
if ($assign instanceof Assign) {
@ -78,13 +86,6 @@ CODE_SAMPLE
return null;
}
}
if ($subNode instanceof Class_) {
$class = $this->refactorClass($subNode);
if ($class instanceof Class_) {
$hasChanged = \true;
}
return null;
}
return null;
});
if ($hasChanged) {
@ -130,7 +131,7 @@ CODE_SAMPLE
}
/**
* @return ArrayDimFetch[]
* @param \PhpParser\Node\Stmt\Namespace_|\Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_ $node
* @param \PhpParser\Node\Stmt\Namespace_|\Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure $node
*/
private function findSameNamedVariableAssigns(Variable $variable, $node) : array
{
@ -161,7 +162,7 @@ CODE_SAMPLE
return $assignedArrayDimFetches;
}
/**
* @param \PhpParser\Node\Stmt\Namespace_|\Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_ $node
* @param \PhpParser\Node\Stmt\Namespace_|\Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure $node
*/
private function refactorAssign(Assign $assign, $node) : ?Assign
{

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'f4f9d5c771017ccf1ca99f30efcdb0e71ebcc22c';
public const PACKAGE_VERSION = '3ed219bb2fb0f598e09ecc061655a97f28a77454';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-06-20 08:45:57';
public const RELEASE_DATE = '2023-06-20 09:48:49';
/**
* @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 ComposerAutoloaderInitfdb1eba100fd05b864785447606068f7::getLoader();
return ComposerAutoloaderInit52002a44aff02a3895d61e0c389cf8d8::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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