Release/2.2

dependency/xml/TemplateTrait.php

@@ -58,7 +58,7 @@ trait TemplateTrait
      * @param string $source
      *
      */
-    public function merge($node=null, $source=null)
+    public function merge($node = null, $source = null)
     {
         // Avoid garbage nodes merge
         if (!isset($this->mergedNodes)) {
@@ -245,7 +245,7 @@ trait TemplateTrait
                 $mergedValue = str_replace($pi, (string) $tmpTextNode->wholeText, $textNode->nodeValue);
 
                 //$mergedValue = str_replace($pi, (string) $value, $textNode->nodeValue);
-                //$mergedValue = htmlentities($mergedValue);
+                $mergedValue = htmlentities($mergedValue);
                 $textNode->nodeValue = str_replace($pi, $value, $mergedValue);
             }
         }