use try-finally for macro compilation

twigphp · Sep 24, 2015 · 53d01ff · 53d01ff
1 parent eea6849
commit 53d01ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/lib/Twig/Node/Macro.php b/lib/Twig/Node/Macro.php
@@ -108,14 +108,14 @@ public function compile(Twig_Compiler $compiler)
             ->write("try {\n")
             ->indent()
             ->subcompile($this->getNode('body'))
+            ->raw("\n")
+            ->write("return ('' === \$tmp = ob_get_contents()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());\n")
             ->outdent()
-            ->write("} catch (Exception \$e) {\n")
+            ->write("} finally {\n")
             ->indent()
-            ->write("ob_end_clean();\n\n")
-            ->write("throw \$e;\n")
+            ->write("ob_end_clean();\n")
             ->outdent()
-            ->write("}\n\n")
-            ->write("return ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());\n")
+            ->write("}\n")
             ->outdent()
             ->write("}\n\n")
         ;

diff --git a/test/Twig/Tests/Node/MacroTest.php b/test/Twig/Tests/Node/MacroTest.php
@@ -55,13 +55,11 @@ public function macro_foo(\$__foo__ = null, \$__bar__ = "Foo"$declaration)
     ob_start();
     try {
         echo "foo";
-    } catch (Exception \$e) {
-        ob_end_clean();
 
-        throw \$e;
+        return ('' === \$tmp = ob_get_contents()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());
+    } finally {
+        ob_end_clean();
     }
-
-    return ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());
 }
 EOF
             ),