bug #2040 handle Throwable (fprochazka)

This PR was merged into the 1.x branch.

Discussion
----------

handle Throwable

Related #2041

Commits
-------

99e9d1c handle Throwable

lib/Twig/Environment.php

@@ -438,6 +438,10 @@ class Twig_Environment
         } catch (Exception $e) {
             $this->setLoader($current);
 
+            throw $e;
+        } catch (Throwable $e) {
+            $this->setLoader($current);
+
             throw $e;
         }
         $this->setLoader($current);

lib/Twig/Node/Macro.php

@@ -109,6 +109,11 @@ class Twig_Node_Macro extends Twig_Node
             ->write("ob_end_clean();\n\n")
             ->write("throw \$e;\n")
             ->outdent()
+            ->write("} catch (Throwable \$e) {\n")
+            ->indent()
+            ->write("ob_end_clean();\n\n")
+            ->write("throw \$e;\n")
+            ->outdent()
             ->write("}\n\n")
             ->write("return ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());\n")
             ->outdent()

lib/Twig/Template.php

@@ -369,6 +369,12 @@ abstract class Twig_Template implements Twig_TemplateInterface
                 ob_end_clean();
             }
 
+            throw $e;
+        } catch (Throwable $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+
             throw $e;
         }
 

test/Twig/Tests/Node/MacroTest.php

@@ -58,6 +58,10 @@ public function getfoo(\$__foo__ = null, \$__bar__ = "Foo"$declaration)
     } catch (Exception \$e) {
         ob_end_clean();
 
+        throw \$e;
+    } catch (Throwable \$e) {
+        ob_end_clean();
+
         throw \$e;
     }