Clean up new batch functionality in escaping functions.

khagesh4 · Oct 21, 2014 · c39d8fb · c39d8fb
1 parent 10ce61b
commit c39d8fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/Template/Template.php b/src/Template/Template.php
@@ -263,28 +263,28 @@ protected function batch($var, $functions)
 
     /**
      * Escape string.
-     * @param  string $string
+     * @param  string      $string
+     * @param  null|string $functions
      * @return string
      */
-    protected function escape($string)
+    protected function escape($string, $functions = null)
     {
-        $functions = array_slice(func_get_args(), 1);
-
         if ($functions) {
-            $string = $this->batch($string, implode('|', $functions));
+            $string = $this->batch($string, $functions);
         }
 
         return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
     }
 
     /**
      * Alias to escape function.
-     * @param  string $string
+     * @param  string      $string
+     * @param  null|string $functions
      * @return string
      */
-    protected function e($string)
+    protected function e($string, $functions = null)
     {
-        return call_user_func_array(array($this, 'escape'), func_get_args());
+        return $this->escape($string, $functions);
     }
 }
 

diff --git a/tests/Template/TemplateTest.php b/tests/Template/TemplateTest.php
@@ -229,7 +229,7 @@ public function testEscapeFunctionBatch()
     {
         vfsStream::create(
             array(
-                'template.php' => '<?php echo $this->escape("<strong>Jonathan</strong>", "strtoupper", "strrev") ?>'
+                'template.php' => '<?php echo $this->escape("<strong>Jonathan</strong>", "strtoupper|strrev") ?>'
             )
         );