Fix miltiple text children in param

richardDobron · Jun 16, 2024 · bcadc2e · bcadc2e
1 parent 52bd461
commit bcadc2e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/fbt/Transform/FbtTransform/FbtAutoWrap.php b/src/fbt/Transform/FbtTransform/FbtAutoWrap.php
@@ -130,7 +130,7 @@ public static function createDescriptionsWithStack(string $moduleName, Node $nod
     {
         $stack[] = $node;
 
-        if ($node->children()) {
+        if ($node->nodes) {
             $filteredChildren = FbtUtils::filterEmptyNodes($node->nodes);
             foreach ($filteredChildren as $child) {
                 if ($child->isElement() && FbtUtils::validateNamespacedFbtElement($moduleName, $node) === 'implicitParamMarker') {

diff --git a/src/fbt/Transform/FbtTransform/Utils/GetNamespacedArgs.php b/src/fbt/Transform/FbtTransform/Utils/GetNamespacedArgs.php
@@ -58,9 +58,7 @@ public function param(Node $node): array
         $node = NodeParser::parse('<html>' . $node->innertext() . '</html>', false, true, DEFAULT_TARGET_CHARSET, false)
             ->find('html', 0);
 
-        $value = FbtUtils::makeFbtElementArrayFromNode($node->children() ?: $node->nodes)[0] ?? '';
-
-        $value = (string)$value;
+        $value = implode('', FbtUtils::makeFbtElementArrayFromNode($node->nodes));
 
         $paramArgs = [$nameAttr, $value];
 

diff --git a/tests/fbt/fbtTest.php b/tests/fbt/fbtTest.php
@@ -632,6 +632,14 @@ public function testHtmlBreak()
 FBT;
 
         $this->assertSame('Bar<br/> Bar<br/> Bar', self::transform($fbt));
+
+        $fbt = <<<FBT
+<fbt desc="Bar">
+    Foo<br/><fbt:param name="lineBreakk">Bar<br>Baz</fbt:param>
+</fbt>
+FBT;
+
+        $this->assertSame('Foo<br/>Bar<br/>Baz', self::transform($fbt));
     }
 
     public function testCheckAlreadyStoredHashes()