From: Tim Otten <totten@civicrm.org>
Date: Tue, 29 Oct 2019 23:07:12 +0000 (-0700)
Subject: ArrayHtml - Encode self-closing HTML tags (`<img />`, `<br />`) normally
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=66342641404af5092bc72c6eb079bfd742e700a5;p=civicrm-core.git

ArrayHtml - Encode self-closing HTML tags (`<img />`, `<br />`) normally
---

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 98204aa65f..748dadfec3 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -33,6 +33,23 @@ class CRM_Afform_ArrayHtml {
     'af-fieldset' => [
       'model' => 'text',
     ],
+    'area' => ['#selfClose' => TRUE],
+    'base' => ['#selfClose' => TRUE],
+    'br' => ['#selfClose' => TRUE],
+    'col' => ['#selfClose' => TRUE],
+    'command' => ['#selfClose' => TRUE],
+    'embed' => ['#selfClose' => TRUE],
+    'hr' => ['#selfClose' => TRUE],
+    'iframe' => ['#selfClose' => TRUE],
+    'img' => ['#selfClose' => TRUE],
+    'input' => ['#selfClose' => TRUE],
+    'keygen' => ['#selfClose' => TRUE],
+    'link' => ['#selfClose' => TRUE],
+    'meta' => ['#selfClose' => TRUE],
+    'param' => ['#selfClose' => TRUE],
+    'source' => ['#selfClose' => TRUE],
+    'track' => ['#selfClose' => TRUE],
+    'wbr' => ['#selfClose' => TRUE],
   ];
 
   /**
@@ -93,9 +110,15 @@ class CRM_Afform_ArrayHtml {
         ]);
       }
     }
-    $buf .= '>';
-    $buf .= $this->convertArraysToHtml($children);
-    $buf .= '</' . $tag . '>';
+
+    if (empty($children) && $this->isSelfClosing($tag)) {
+      $buf .= ' />';
+    }
+    else {
+      $buf .= '>';
+      $buf .= $this->convertArraysToHtml($children);
+      $buf .= '</' . $tag . '>';
+    }
     return $buf;
   }
 
@@ -182,6 +205,17 @@ class CRM_Afform_ArrayHtml {
     return $children;
   }
 
+  /**
+   * @param string $tag
+   *   Ex: 'img', 'div'
+   * @return bool
+   *   TRUE if the tag should look like '<img/>'.
+   *   FALSE if the tag should look like '<div></div>'.
+   */
+  protected function isSelfClosing($tag) {
+    return $this->protoSchema[$tag]['#selfClose'] ?? FALSE;
+  }
+
   /**
    * Determine the type of data that is stored in an attribute.
    *
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index f63272b6fe..0fdbc9ac40 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -65,7 +65,7 @@ class api_v4_AfformTest extends api_v4_AfformTestCase {
   public function getFormatExamples() {
     $es = [];
 
-    foreach (['empty', 'string', 'comments', 'apple', 'banana', 'cherry'] as $exampleName) {
+    foreach (['empty', 'string', 'comments', 'self-closing', 'apple', 'banana', 'cherry'] as $exampleName) {
       $exampleFile = '/formatExamples/' . $exampleName . '.php';
       $example = require __DIR__ . $exampleFile;
       $formats = ['html', 'shallow', 'deep'];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php
new file mode 100644
index 0000000000..ab68d0238b
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php
@@ -0,0 +1,27 @@
+<?php
+
+return [
+  'html' => '<span class="one"></span><img class="two" /><div><br class="three" /><br /></div>',
+  'shallow' => [
+    ['#tag' => 'span', 'class' => 'one'],
+    ['#tag' => 'img', 'class' => 'two'],
+    [
+      '#tag' => 'div',
+      '#children' => [
+        ['#tag' => 'br', 'class' => 'three'],
+        ['#tag' => 'br'],
+      ],
+    ],
+  ],
+  'deep' => [
+    ['#tag' => 'span', 'class' => 'one'],
+    ['#tag' => 'img', 'class' => 'two'],
+    [
+      '#tag' => 'div',
+      '#children' => [
+        ['#tag' => 'br', 'class' => 'three'],
+        ['#tag' => 'br'],
+      ],
+    ],
+  ],
+];