mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-25 01:46:45 +02:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit e6d869b35e2e5785d8691408b490fa6283abb784

Browse Source 
e6d869b35e [Parser] Using resolveNeighborNextStmt() in resolveNextNodeFromOtherNode() as well on BetterNodeFinder (#3895)
This commit is contained in:
Tomas Votruba 2023-05-19 12:24:31 +00:00
parent d9f7fc972a
commit 4d2dd37572
5 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'f24703ec719c78e87fc75cdbe6e7eadde51dfde9';
public const PACKAGE_VERSION = 'e6d869b35e2e5785d8691408b490fa6283abb784';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-19 19:02:28';
public const RELEASE_DATE = '2023-05-19 12:19:41';
/**
* @var int
*/

13
src/PhpParser/Node/BetterNodeFinder.php
View File

@ -486,10 +486,17 @@ final class BetterNodeFinder
if (!isset($stmtsAware->stmts[$key - 1])) {
return $stmtsAware->stmts[$key + 1] ?? null;
}
if ($stmtsAware->stmts[$key - 1]->getStartTokenPos() !== $stmt->getStartTokenPos()) {
$startTokenPos = $stmt->getStartTokenPos();
if ($stmtsAware->stmts[$key - 1]->getStartTokenPos() !== $startTokenPos) {
return $stmtsAware->stmts[$key + 1] ?? null;
}
return $stmtsAware->stmts[$key] ?? null;
if (!isset($stmtsAware->stmts[$key])) {
return null;
}
if ($stmtsAware->stmts[$key]->getStartTokenPos() === $startTokenPos) {
return null;
}
return $stmtsAware->stmts[$key];
}
/**
* Only search in next Node/Stmt
@ -625,7 +632,7 @@ final class BetterNodeFinder
return null;
}
$currentStmtKey = $currentStmt->getAttribute(AttributeKey::STMT_KEY);
return $parentNode->stmts[$currentStmtKey + 1] ?? null;
return $this->resolveNeighborNextStmt($parentNode, $currentStmt, $currentStmtKey);
}
return $nextNode;
}

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitdc9b11164928168adf89db4914db335e::getLoader();
return ComposerAutoloaderInit61157adf679a3a61c07fee4a0014248a::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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