ArrayHtml - Change text node format from string to array

Everything in the arrayHtml is associative exept text nodes were just strings.
That made it difficult to loop through the whole thing in javascript, so
this updates the format to be consistent with everything else.

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 6f511792625903477cbac105b23505868f7c4913..99fd3221b7b1b8de3c773e286f6b8d2b7234f31a 100644 (file)
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -86,6 +86,10 @@ class CRM_Afform_ArrayHtml {
       return sprintf('<!--%s-->', $array['#comment']);
     }
 
+    if (isset($array['#text'])) {
+      return $array['#text'];
+    }
+
     $tag = empty($array['#tag']) ? self::DEFAULT_TAG : $array['#tag'];
     unset($array['#tag']);
     $children = empty($array['#children']) ? [] : $array['#children'];
@@ -183,7 +187,7 @@ class CRM_Afform_ArrayHtml {
       return $arr;
     }
     elseif ($node instanceof DOMText) {
-      return $node->textContent;
+      return ['#text' => $node->textContent];
     }
     elseif ($node instanceof DOMComment) {
       $arr = ['#comment' => $node->nodeValue];

diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
index dc37c5024bd876dfff32bae3962d2431d025cdad..28d8ba4be2f6a69fa70785806e34a3d72237ac23 100644 (file)
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
@@ -3,9 +3,9 @@
 return [
   'html' => '<strong>New text!</strong>',
   'shallow' => [
-    ['#tag' => 'strong', '#children' => ['New text!']],
+    ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
   ],
   'deep' => [
-    ['#tag' => 'strong', '#children' => ['New text!']],
+    ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
   ],
 ];

diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
index bf33a0a21f0c4e75c4ad354d5d8449376f763194..7e0a134caaa0032a3512d5b9ca2e7e619082b847 100644 (file)
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -6,7 +6,7 @@ return [
     [
       '#tag' => 'div',
       '#children' => [
-        ['#tag' => 'strong', '#children' => ['New text!']],
+        ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
       ],
     ],
@@ -15,7 +15,7 @@ return [
     [
       '#tag' => 'div',
       '#children' => [
-        ['#tag' => 'strong', '#children' => ['New text!']],
+        ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => ['label' => 'Do not do any of the emailing']],
       ],
     ],

diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
index 879329bce31e3295c6f9d7c6977fa576b631ac51..f47efed0e462f7e7abf6d653cb90ad38cd748ef9 100644 (file)
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
@@ -3,13 +3,13 @@
 return [
   'html' => '<span>First</span> <span>Second</span>',
   'shallow' => [
-    ['#tag' => 'span', '#children' => ['First']],
-    ' ',
-    ['#tag' => 'span', '#children' => ['Second']],
+    ['#tag' => 'span', '#children' => [['#text' => 'First']]],
+    ['#text' => ' '],
+    ['#tag' => 'span', '#children' => [['#text' => 'Second']]],
   ],
   'deep' => [
-    ['#tag' => 'span', '#children' => ['First']],
-    ' ',
-    ['#tag' => 'span', '#children' => ['Second']],
+    ['#tag' => 'span', '#children' => [['#text' => 'First']]],
+    ['#text' => ' '],
+    ['#tag' => 'span', '#children' => [['#text' => 'Second']]],
   ],
 ];

diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
index 248cffddb34cebef36591aa261e0a31187d67aaf..c311e930e67ffd258b6be64b33136e7bb4737329 100644 (file)
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
@@ -6,11 +6,11 @@ return [
     [
       '#tag' => 'div',
       '#children' => [
-        'One',
+        ['#text' => 'One'],
         ['#comment' => ' uno '],
-        ' Two ',
+        ['#text' => ' Two '],
         ['#comment' => 'dos & so on '],
-        ' Three',
+        ['#text' => ' Three'],
       ],
     ],
     ['#comment' => 'tres-a--b---c'],
@@ -19,11 +19,11 @@ return [
     [
       '#tag' => 'div',
       '#children' => [
-        'One',
+        ['#text' => 'One'],
         ['#comment' => ' uno '],
-        ' Two ',
+        ['#text' => ' Two '],
         ['#comment' => 'dos & so on '],
-        ' Three',
+        ['#text' => ' Three'],
       ],
     ],
     ['#comment' => 'tres-a--b---c'],

diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
index 18ccc7f48751ca0812b19292c3fb6cd6c862cb69..221e1a36f05864fe56460212c8998dce5b858aee 100644 (file)
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
@@ -2,6 +2,6 @@
 
 return [
   'html' => 'hello world',
-  'shallow' => ['hello world'],
-  'deep' => ['hello world'],
+  'shallow' => [['#text' => 'hello world']],
+  'deep' => [['#text' => 'hello world']],
 ];