Merge pull request #92 from Akollade/twig-3.9

Adapt Twig node to remove usage of ob_start with Twig 3.9
Akollade · Apr 24, 2024 · 14814bf · 14814bf
2 parents e98f3cd + 8bad3df
commit 14814bf
Showing 1 changed file with 30 additions and 6 deletions.
diff --git a/src/Twig/Node.php b/src/Twig/Node.php
@@ -3,6 +3,7 @@
 namespace NotFloran\MjmlBundle\Twig;
 
 use Twig\Compiler;
+use Twig\Node\CaptureNode;
 use Twig\Node\Node as Twig_Node;
 
 class Node extends Twig_Node
@@ -13,6 +14,11 @@ class Node extends Twig_Node
      */
     public function __construct(Twig_Node $value, $line, $tag = null)
     {
+        if (class_exists(CaptureNode::class)) {
+            $value = new CaptureNode($value, $line, $tag);
+            $value->setAttribute('raw', true);
+        }
+
         parent::__construct(['value' => $value], ['name' => $tag], $line, $tag);
     }
 
@@ -21,14 +27,32 @@ public function __construct(Twig_Node $value, $line, $tag = null)
      */
     public function compile(Compiler $compiler): void
     {
-        $compiler->addDebugInfo($this)
-            ->write('ob_start();'.PHP_EOL)
-            ->subcompile($this->getNode('value'))
-            ->write('$content = ob_get_clean();'.PHP_EOL)
+        if (class_exists(CaptureNode::class)) {
+            $compiler
+                ->addDebugInfo($this)
+                ->indent()
+                ->write('$content = ')
+                ->subcompile($this->getNode('value'))
+                ->raw("\n")
+                ->outdent()
+            ;
+        } else {
+            $compiler
+                ->addDebugInfo($this)
+                ->indent()
+                ->write("ob_start();\n")
+                ->subcompile($this->getNode('value'))
+                ->outdent()
+                ->write("\$content = ob_get_clean();\n")
+            ;
+        }
+
+        $compiler
             ->write('preg_match("/^\s*/", $content, $matches);'.PHP_EOL)
             ->write('$lines = explode("\n", $content);'.PHP_EOL)
             ->write('$content = preg_replace(\'/^\' . $matches[0]. \'/\', "", $lines);'.PHP_EOL)
-            ->write('$content = implode("\n", $content);'.PHP_EOL)
-            ->write('echo $this->env->getExtension("'.Extension::class.'")->getMjml()->render($content);'.PHP_EOL);
+            ->write('$content = implode("\n", $content);'.PHP_EOL);
+
+        $compiler->write('echo $this->env->getExtension("'.Extension::class.'")->getMjml()->render($content);'.PHP_EOL);
     }
 }