- Fixed a bug added in previous commit

src/Extension/PrintExtension.php

@@ -22,20 +22,21 @@ class PrintExtension implements Extension {
     {
         $opt = $context->tokenOptions($token);
 
-        switch($token) {
+        switch($context->tokenName($token)) {
             case 'echo':
             case 'print':
+                if (in_array('raw', $opt)) {
+                    return "<?php echo $arguments ?>";
+                }
+
                 return "<?php echo htmlspecialchars((string) $arguments, {$this->flag}, '{$this->encoding}', " . ($this->doubleEncode ? "true" : "false") . ") ?>";
 
-            case 'echo.raw':
-            case "print.raw":
-                return "<?php echo $arguments ?>";
-
             case 'printf':
-                return "<?php echo htmlspecialchars(sprintf((string) $arguments), {$this->flag}, '{$this->encoding}', " . ($this->doubleEncode ? "true" : "false") . ") ?>";
+                if (in_array('raw', $opt)) {
+                    return "<?php printf((string) $arguments) ?>";
+                }
 
-            case 'printf.raw':
-                return "<?php printf((string) $arguments) ?>";
+                return "<?php echo htmlspecialchars(sprintf((string) $arguments), {$this->flag}, '{$this->encoding}', " . ($this->doubleEncode ? "true" : "false") . ") ?>";
         }
     }