Merge pull request #40 from baileylo/master

Allow batch functionality from escape functions
thephpleague · Oct 21, 2014 · 10ce61b · 10ce61b
2 parents 22ae882 + 5f26027
commit 10ce61b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/Template/Template.php b/src/Template/Template.php
@@ -268,6 +268,12 @@ protected function batch($var, $functions)
      */
     protected function escape($string)
     {
+        $functions = array_slice(func_get_args(), 1);
+
+        if ($functions) {
+            $string = $this->batch($string, implode('|', $functions));
+        }
+
         return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
     }
 
@@ -278,7 +284,7 @@ protected function escape($string)
      */
     protected function e($string)
     {
-        return $this->escape($string);
+        return call_user_func_array(array($this, 'escape'), func_get_args());
     }
 }
 

diff --git a/tests/Template/TemplateTest.php b/tests/Template/TemplateTest.php
@@ -225,6 +225,17 @@ public function testEscapeFunction()
         $this->assertEquals($this->template->render(), '&lt;strong&gt;Jonathan&lt;/strong&gt;');
     }
 
+    public function testEscapeFunctionBatch()
+    {
+        vfsStream::create(
+            array(
+                'template.php' => '<?php echo $this->escape("<strong>Jonathan</strong>", "strtoupper", "strrev") ?>'
+            )
+        );
+
+        $this->assertEquals($this->template->render(), '&gt;GNORTS/&lt;NAHTANOJ&gt;GNORTS&lt;');
+    }
+
     public function testEscapeShortcutFunction()
     {
         vfsStream::create(