octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-29 15:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit dda7cdb03aa2b273af0ce35e1b195e03d0e3d3d2

Browse Source 
dda7cdb03a [Printer] Use <= 0 check for getStartTokenPos() for current node availability on MixPhpHtmlDecorator (#3308)
This commit is contained in:
Tomas Votruba 2023-01-26 17:16:47 +00:00
parent 16e7e0d008
commit b0a48d1e0a
6 changed files with 17 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

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '8ddb48097219683f23faa75e2365c5161cc623a8';
public const PACKAGE_VERSION = 'dda7cdb03aa2b273af0ce35e1b195e03d0e3d3d2';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-01-26 00:22:09';
public const RELEASE_DATE = '2023-01-27 00:11:30';
/**
* @var int
*/

9
src/NodeDecorator/MixPhpHtmlDecorator.php
View File

@ -9,7 +9,6 @@ use PhpParser\Node;
use PhpParser\Node\Stmt\InlineHTML;
use PhpParser\Node\Stmt\Nop;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\Core\ValueObject\Application\File;
use Rector\NodeRemoval\NodeRemover;
use Rector\NodeTypeResolver\Node\AttributeKey;
/**
@ -36,15 +35,13 @@ final class MixPhpHtmlDecorator
/**
* @param Node[] $nodes
*/
public function decorateNextNodesInlineHTML(File $file, array $nodes) : void
public function decorateNextNodesInlineHTML(array $nodes) : void
{
$oldTokens = $file->getOldTokens();
foreach ($nodes as $key => $subNode) {
if ($subNode instanceof InlineHTML) {
continue;
}
$endTokenPost = $subNode->getEndTokenPos();
if (isset($oldTokens[$endTokenPost])) {
if ($subNode->getStartTokenPos() >= 0) {
return;
}
if (!isset($nodes[$key + 1])) {
@ -54,7 +51,7 @@ final class MixPhpHtmlDecorator
if ($nodes[$key + 1] instanceof InlineHTML) {
// No token end? Just added
$nodes[$key + 1]->setAttribute(AttributeKey::ORIGINAL_NODE, null);
break;
return;
}
}
}

4
src/Rector/AbstractRector.php
View File

@ -404,9 +404,9 @@ CODE_SAMPLE;
$nodes = \array_merge(\is_array($nodes) ? $nodes : \iterator_to_array($nodes), [$nextNode]);
}
if (\count($nodes) > 1) {
$this->mixPhpHtmlDecorator->decorateNextNodesInlineHTML($this->file, $nodes);
$this->mixPhpHtmlDecorator->decorateNextNodesInlineHTML($nodes);
} elseif ($firstNode instanceof FileWithoutNamespace) {
$this->mixPhpHtmlDecorator->decorateNextNodesInlineHTML($this->file, $firstNode->stmts);
$this->mixPhpHtmlDecorator->decorateNextNodesInlineHTML($firstNode->stmts);
}
$nodeTraverser = new NodeTraverser();
$nodeTraverser->addVisitor(new NodeConnectingVisitor());

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

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