Skip to content

Commit 3619383

Browse files
committed
Updated Rector to commit 79953f61e341fdb7263316b34eeaa2be737d12ef
rectorphp/rector-src@79953f6 [TypeDeclaration] Add Closure support on StrictArrayParamDimFetchRector (#4632)
1 parent 59b728d commit 3619383

File tree

5 files changed

+25
-16
lines changed

5 files changed

+25
-16
lines changed

rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php

+13-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
use PhpParser\Node\Expr\ArrayDimFetch;
88
use PhpParser\Node\Expr\AssignOp\Coalesce as AssignOpCoalesce;
99
use PhpParser\Node\Expr\BinaryOp\Coalesce;
10+
use PhpParser\Node\Expr\Closure;
1011
use PhpParser\Node\Expr\FuncCall;
1112
use PhpParser\Node\Expr\Variable;
13+
use PhpParser\Node\FunctionLike;
1214
use PhpParser\Node\Identifier;
1315
use PhpParser\Node\Param;
16+
use PhpParser\Node\Stmt\Class_;
1417
use PhpParser\Node\Stmt\ClassMethod;
1518
use PhpParser\Node\Stmt\Function_;
1619
use PhpParser\NodeTraverser;
@@ -59,10 +62,10 @@ public function resolve(array $item)
5962
*/
6063
public function getNodeTypes() : array
6164
{
62-
return [ClassMethod::class, Function_::class];
65+
return [ClassMethod::class, Function_::class, Closure::class];
6366
}
6467
/**
65-
* @param ClassMethod|Function_ $node
68+
* @param ClassMethod|Function_|Closure $node
6669
*/
6770
public function refactor(Node $node) : ?Node
6871
{
@@ -86,13 +89,19 @@ public function refactor(Node $node) : ?Node
8689
return null;
8790
}
8891
/**
89-
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_ $functionLike
92+
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure $functionLike
9093
*/
9194
private function isParamAccessedArrayDimFetch(Param $param, $functionLike) : bool
9295
{
96+
if ($functionLike->stmts === null) {
97+
return \false;
98+
}
9399
$paramName = $this->getName($param);
94100
$isParamAccessedArrayDimFetch = \false;
95-
$this->traverseNodesWithCallable($functionLike, function (Node $node) use($paramName, &$isParamAccessedArrayDimFetch) : ?int {
101+
$this->traverseNodesWithCallable($functionLike->stmts, function (Node $node) use($paramName, &$isParamAccessedArrayDimFetch) : ?int {
102+
if ($node instanceof Class_ || $node instanceof FunctionLike) {
103+
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
104+
}
96105
if ($this->shouldStop($node, $paramName)) {
97106
// force set to false to avoid too early replaced
98107
$isParamAccessedArrayDimFetch = \false;

src/Application/VersionResolver.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = '36e88e13e5d41db048494b497d59ae0e96c877f0';
22+
public const PACKAGE_VERSION = '79953f61e341fdb7263316b34eeaa2be737d12ef';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2023-08-03 20:52:40';
27+
public const RELEASE_DATE = '2023-08-03 21:00:56';
2828
/**
2929
* @var int
3030
*/

vendor/autoload.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

2323
require_once __DIR__ . '/composer/autoload_real.php';
2424

25-
return ComposerAutoloaderInit3d41daa140625cb5a46044552327926a::getLoader();
25+
return ComposerAutoloaderInitf3635f7070cdd35c0d9b3bdb494eb86c::getLoader();

vendor/composer/autoload_real.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInit3d41daa140625cb5a46044552327926a
5+
class ComposerAutoloaderInitf3635f7070cdd35c0d9b3bdb494eb86c
66
{
77
private static $loader;
88

@@ -22,17 +22,17 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25-
spl_autoload_register(array('ComposerAutoloaderInit3d41daa140625cb5a46044552327926a', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInitf3635f7070cdd35c0d9b3bdb494eb86c', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInit3d41daa140625cb5a46044552327926a', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInitf3635f7070cdd35c0d9b3bdb494eb86c', 'loadClassLoader'));
2828

2929
require __DIR__ . '/autoload_static.php';
30-
call_user_func(\Composer\Autoload\ComposerStaticInit3d41daa140625cb5a46044552327926a::getInitializer($loader));
30+
call_user_func(\Composer\Autoload\ComposerStaticInitf3635f7070cdd35c0d9b3bdb494eb86c::getInitializer($loader));
3131

3232
$loader->setClassMapAuthoritative(true);
3333
$loader->register(true);
3434

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInit3d41daa140625cb5a46044552327926a::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInitf3635f7070cdd35c0d9b3bdb494eb86c::$files;
3636
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3737
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3838
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInit3d41daa140625cb5a46044552327926a
7+
class ComposerStaticInitf3635f7070cdd35c0d9b3bdb494eb86c
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3025,9 +3025,9 @@ class ComposerStaticInit3d41daa140625cb5a46044552327926a
30253025
public static function getInitializer(ClassLoader $loader)
30263026
{
30273027
return \Closure::bind(function () use ($loader) {
3028-
$loader->prefixLengthsPsr4 = ComposerStaticInit3d41daa140625cb5a46044552327926a::$prefixLengthsPsr4;
3029-
$loader->prefixDirsPsr4 = ComposerStaticInit3d41daa140625cb5a46044552327926a::$prefixDirsPsr4;
3030-
$loader->classMap = ComposerStaticInit3d41daa140625cb5a46044552327926a::$classMap;
3028+
$loader->prefixLengthsPsr4 = ComposerStaticInitf3635f7070cdd35c0d9b3bdb494eb86c::$prefixLengthsPsr4;
3029+
$loader->prefixDirsPsr4 = ComposerStaticInitf3635f7070cdd35c0d9b3bdb494eb86c::$prefixDirsPsr4;
3030+
$loader->classMap = ComposerStaticInitf3635f7070cdd35c0d9b3bdb494eb86c::$classMap;
30313031

30323032
}, null, ClassLoader::class);
30333033
}

0 commit comments

Comments
 (0)