diff --git a/src/NodeDecorator/MixPhpHtmlDecorator.php b/src/NodeDecorator/MixPhpHtmlDecorator.php index 01d4348b190..a6fadd03edf 100644 --- a/src/NodeDecorator/MixPhpHtmlDecorator.php +++ b/src/NodeDecorator/MixPhpHtmlDecorator.php @@ -40,7 +40,7 @@ public function decorateNextNodesInlineHTML(File $file, array $nodes): void $endTokenPost = $subNode->getEndTokenPos(); if (isset($oldTokens[$endTokenPost])) { - continue; + return; } if (! isset($nodes[$key + 1])) { @@ -51,6 +51,7 @@ public function decorateNextNodesInlineHTML(File $file, array $nodes): void if ($nodes[$key + 1] instanceof InlineHTML) { // No token end? Just added $nodes[$key + 1]->setAttribute(AttributeKey::ORIGINAL_NODE, null); + break; } } } diff --git a/tests/Issues/InsertFirstBeforeInlineHTML/Fixture/fixture.php.inc b/tests/Issues/InsertFirstBeforeInlineHTML/Fixture/fixture.php.inc index 6a8218240fe..62d1afcdad5 100644 --- a/tests/Issues/InsertFirstBeforeInlineHTML/Fixture/fixture.php.inc +++ b/tests/Issues/InsertFirstBeforeInlineHTML/Fixture/fixture.php.inc @@ -2,6 +2,7 @@ -----
stmts = array_merge( - [$echo], + [$echo, $echo], $node->stmts ); diff --git a/tests/Issues/ReturnArrayNodeBeforeInlineHTMLStmt/FixtureArrayBeforeInlineHTML/fixture.php.inc b/tests/Issues/ReturnArrayNodeBeforeInlineHTMLStmt/FixtureArrayBeforeInlineHTML/fixture.php.inc index 6a8218240fe..62d1afcdad5 100644 --- a/tests/Issues/ReturnArrayNodeBeforeInlineHTMLStmt/FixtureArrayBeforeInlineHTML/fixture.php.inc +++ b/tests/Issues/ReturnArrayNodeBeforeInlineHTMLStmt/FixtureArrayBeforeInlineHTML/fixture.php.inc @@ -2,6 +2,7 @@ -----
filter ; -----
justAdded[$this->file->getFilePath()] = true; return [ + $echo, $echo, $node, ];