Updated Rector to commit ed0be502e5d74171d59e67874f089f69429a01b0

ed0be502e5 UseImportsTraverser: don't deep traverse (#4994)
This commit is contained in:
Tomas Votruba 2023-09-11 15:55:07 +00:00
parent 0acf99c06a
commit df6678519f
5 changed files with 22 additions and 20 deletions

View File

@ -3,11 +3,14 @@
declare (strict_types=1);
namespace Rector\CodingStyle\ClassNameImport;
use PhpParser\Node\Stmt\Namespace_;
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
use PhpParser\Node;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\GroupUse;
use PhpParser\Node\Stmt\Use_;
use PhpParser\Node\Stmt\UseUse;
use PhpParser\NodeTraverser;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
final class UseImportsTraverser
@ -58,11 +61,11 @@ final class UseImportsTraverser
private function traverseForType(array $stmts, callable $callable, int $desiredType) : void
{
$this->simpleCallableNodeTraverser->traverseNodesWithCallable($stmts, function (Node $node) use($callable, $desiredType) {
if ($node instanceof Use_) {
// only import uses
if ($node->type !== $desiredType) {
return null;
}
if ($node instanceof Namespace_ || $node instanceof FileWithoutNamespace) {
// traverse into namespaces
return null;
}
if ($node instanceof Use_ && $node->type === $desiredType) {
foreach ($node->uses as $useUse) {
$name = $this->nodeNameResolver->getName($useUse);
if ($name === null) {
@ -70,11 +73,10 @@ final class UseImportsTraverser
}
$callable($useUse, $name);
}
}
if ($node instanceof GroupUse) {
} elseif ($node instanceof GroupUse) {
$this->processGroupUse($node, $desiredType, $callable);
}
return null;
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
});
}
/**

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '7b4858b689e23bac39c47ddbf06df4842f453936';
public const PACKAGE_VERSION = 'ed0be502e5d74171d59e67874f089f69429a01b0';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-09-11 15:27:56';
public const RELEASE_DATE = '2023-09-11 22:52:19';
/**
* @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 ComposerAutoloaderInitbd6b28def8d74c9cc21238e5a263a42b::getLoader();
return ComposerAutoloaderInite59dc46ec06495cc986235f04fdb8a91::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitbd6b28def8d74c9cc21238e5a263a42b
class ComposerAutoloaderInite59dc46ec06495cc986235f04fdb8a91
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitbd6b28def8d74c9cc21238e5a263a42b
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitbd6b28def8d74c9cc21238e5a263a42b', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInite59dc46ec06495cc986235f04fdb8a91', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitbd6b28def8d74c9cc21238e5a263a42b', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInite59dc46ec06495cc986235f04fdb8a91', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitbd6b28def8d74c9cc21238e5a263a42b::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInite59dc46ec06495cc986235f04fdb8a91::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitbd6b28def8d74c9cc21238e5a263a42b::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInite59dc46ec06495cc986235f04fdb8a91::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitbd6b28def8d74c9cc21238e5a263a42b
class ComposerStaticInite59dc46ec06495cc986235f04fdb8a91
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2595,9 +2595,9 @@ class ComposerStaticInitbd6b28def8d74c9cc21238e5a263a42b
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitbd6b28def8d74c9cc21238e5a263a42b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitbd6b28def8d74c9cc21238e5a263a42b::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitbd6b28def8d74c9cc21238e5a263a42b::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInite59dc46ec06495cc986235f04fdb8a91::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite59dc46ec06495cc986235f04fdb8a91::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite59dc46ec06495cc986235f04fdb8a91::$classMap;
}, null, ClassLoader::class);
}