Small fixes for addHtml.

hskrtich · hskrtich · commit d17a80630501 · 2014-06-09T16:32:12.000-06:00
Adding some HTML Entities to the test for addHTML
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
@@ -42,9 +42,14 @@ public static function addHtml($element, $html, $fullHTML = false)
          * which could be applied when such an element occurs in the parseNode function.
          */
 
-        // Preprocess: remove all line ends, decode HTML entity, and add body tag for HTML fragments
+        // Preprocess: remove all line ends, decode HTML entity,
+        // fix ampersand and angle brackets and add body tag for HTML fragments
         $html = str_replace(array("\n", "\r"), '', $html);
-        $html = html_entity_decode($html);
+        $html = str_replace(array('&lt;', '&gt;', '&amp;'), array('_lt_', '_gt_', '_amp_'), $html);
+        $html = html_entity_decode($html, ENT_QUOTES, 'UTF-8');
+        $html = str_replace('&', '&amp;', $html);
+        $html = str_replace(array('_lt_', '_gt_', '_amp_'), array('&lt;', '&gt;', '&amp;'), $html);
+
         if ($fullHTML === false) {
             $html = '<body>' . $html . '</body>';
         }
diff --git a/tests/PhpWord/Tests/Shared/HtmlTest.php b/tests/PhpWord/Tests/Shared/HtmlTest.php
@@ -60,6 +60,12 @@ public function testAddHtml()
         $content .= '<table><tr><th>Header</th><td>Content</td></tr></table>';
         $content .= '<ul><li>Bullet</li><ul><li>Bullet</li></ul></ul>';
         $content .= '<ol><li>Bullet</li></ol>';
+        $content .= "'Single Quoted Text'";
+        $content .= '"Double Quoted Text"';
+        $content .= '& Ampersand';
+        $content .= '&lt;&gt;&ldquo;&lsquo;&rsquo;&laquo;&raquo;&lsaquo;&rsaquo;';
+        $content .= '&amp;&bull;&deg;&hellip;&trade;&copy;&reg;&mdash;';
+        $content .= '&ndash;&nbsp;&emsp;&ensp;&sup2;&sup3;&frac14;&frac12;&frac34;';
         Html::addHtml($section, $content);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,12 @@ public function testAddHtml()`
`60`	`60`	`$content .= '<table><tr><th>Header</th><td>Content</td></tr></table>';`
`61`	`61`	`$content .= '<ul><li>Bullet</li><ul><li>Bullet</li></ul></ul>';`
`62`	`62`	`$content .= '<ol><li>Bullet</li></ol>';`
	`63`	`+ $content .= "'Single Quoted Text'";`
	`64`	`+ $content .= '"Double Quoted Text"';`
	`65`	`+ $content .= '& Ampersand';`
	`66`	`+ $content .= '<>“‘’«»&lsaquo;&rsaquo;';`
	`67`	`+ $content .= '&•°…™©®—';`
	`68`	`+ $content .= '– &emsp;&ensp;²³¼½¾';`
`63`	`69`	`Html::addHtml($section, $content);`
`64`	`70`	`}`
`65`	`71`	`}`