fixed twig 3.9 compatibility

Author: nutama

composer.json

@@ -15,7 +15,7 @@
         "doctrine/inflector":   "^2.0.8",
         "doctrine/orm":         "^2.17.2",
         "symfony/filesystem":   "^5.4||^6.0",
-        "twig/twig":            "^3.4.3"
+        "twig/twig":            "3.9.3"
     },
     "require-dev": {
         "composer/composer":        "^2.0.0",
@@ -24,9 +24,6 @@
         "phpspec/prophecy-phpunit": "^2.1",
         "phpunit/phpunit":          "^9.6.0"
     },
-    "conflict": {
-        "twig/twig": "^3.9.0"
-    },
     "autoload": {
         "psr-4": {
             "Hostnet\\Component\\AccessorGenerator\\": "src/"

src/Twig/PerLineNode.php

@@ -6,7 +6,9 @@
 
 namespace Hostnet\Component\AccessorGenerator\Twig;
 
+use Twig\Attribute\YieldReady;
 use Twig\Compiler;
+use Twig\Node\CaptureNode;
 use Twig\Node\Node;
 
 /**
@@ -25,6 +27,7 @@
  *            the perline block, otherwise a Twig_Node with sub nodes of all
  *            the nodes between the prefix and/or postfix.
  */
+#[YieldReady]
 class PerLineNode extends Node
 {
     /**
@@ -57,19 +60,19 @@ private function compileComplex(Compiler $compiler): void
     {
         $prefix  = $this->getAttribute('prefix');
         $postfix = $this->getAttribute('postfix');
-        $lines   = $this->getNode('lines');
 
         // We use normal subcompilation, which uses echo so we buffer our output.
-        $compiler->write("ob_start();\n");
-        $compiler->subcompile($lines);
+        $compiler->write('$lines = ');
+        $compiler->subcompile(new CaptureNode($this->getNode('lines'), $this->getNode('lines')->lineno));
+        $compiler->raw("\n");
 
         $ltrim_prefix = ltrim($prefix);                        // Trimmed version for use on first line
         $indent       = ! trim($prefix) && ! trim($postfix);   // Are we only indenting or also prefixing
 
         // Fetch the content of the lines inside of this block
-        // and itterate over them
+        // and iterate over them
         $compiler
-            ->write("\$lines = explode(\"\\n\", ob_get_clean());\n")
+            ->write("\$lines = explode(\"\\n\", \$lines);\n")
             ->write("foreach (\$lines as \$key => \$line) {\n")
             ->indent(1);
 
@@ -82,11 +85,11 @@ private function compileComplex(Compiler $compiler): void
 
         // Write out the prefix for this line.
         if ($prefix) {
-            $compiler->write("echo \$key > 0 ? '$prefix' : '$ltrim_prefix' ;\n");
+            $compiler->write("yield \$key > 0 ? '$prefix' : '$ltrim_prefix' ;\n");
         }
 
         // Write the line itself
-        $compiler->write("echo \"\$line\";\n");
+        $compiler->write("yield \"\$line\";\n");
 
         // Close if statement for empty line check when indenting.
         if ($indent) {
@@ -97,7 +100,7 @@ private function compileComplex(Compiler $compiler): void
 
         // Write postfix and new line.
         $compiler
-            ->write("echo \"$postfix\\n\";\n")
+            ->write("yield \"$postfix\\n\";\n")
             ->outdent(1)
             ->write("}\n");
     }

test/Twig/CodeGenerationExtensionTest.php

@@ -37,7 +37,6 @@ public function __construct($name = null, array $data = [], $data_name = '')
             'singularize'         => '{{ data | singularize }}',
             'twos_complement_min' => '{{ data | twos_complement_min }}',
             'twos_complement_max' => '{{ data | twos_complement_max }}',
-            'singularize'         => '{{ data | singularize }}',
             'perline_stars'       => " {% perline %}\n * {{data}} *\n{% endperline %}",
             'perline_indent'      => "    {% perline %}\n    {{data}}\n    {% endperline %}",
             'decimal_right_shift' => '{{ data | decimal_right_shift(amount) }}',

test/Twig/fixtures/data.php

@@ -1,2 +1,2 @@
 // line 1
-echo ($context["data"] ?? null);
+yield ($context["data"] ?? null);

test/Twig/fixtures/data_postfix.php

@@ -1,8 +1,9 @@
 // line 1
-ob_start();
-echo ($context["data"] ?? null);
-$lines = explode("\n", ob_get_clean());
+$lines = ('' === $tmp = \Twig\Extension\CoreExtension::captureOutput((function () use (&$context, $macros) {
+    yield ($context["data"] ?? null);
+})() ?? new \EmptyIterator())) ? '' : new Markup($tmp, $this->env->getCharset());
+$lines = explode("\n", $lines);
 foreach ($lines as $key => $line) {
-    echo "$line";
-    echo "// POSTFIX\n";
+    yield "$line";
+    yield "// POSTFIX\n";
 }

test/Twig/fixtures/indent_data.php

@@ -1,11 +1,12 @@
 // line 1
-ob_start();
-echo ($context["data"] ?? null);
-$lines = explode("\n", ob_get_clean());
+$lines = ('' === $tmp = \Twig\Extension\CoreExtension::captureOutput((function () use (&$context, $macros) {
+    yield ($context["data"] ?? null);
+})() ?? new \EmptyIterator())) ? '' : new Markup($tmp, $this->env->getCharset());
+$lines = explode("\n", $lines);
 foreach ($lines as $key => $line) {
     if (trim($line)) {
-        echo $key > 0 ? '    ' : '' ;
-        echo "$line";
+        yield $key > 0 ? '    ' : '' ;
+        yield "$line";
     }
-    echo "\n";
+    yield "\n";
 }

test/Twig/fixtures/indent_data_postfix.php

@@ -1,9 +1,10 @@
 // line 1
-ob_start();
-echo ($context["data"] ?? null);
-$lines = explode("\n", ob_get_clean());
+$lines = ('' === $tmp = \Twig\Extension\CoreExtension::captureOutput((function () use (&$context, $macros) {
+    yield ($context["data"] ?? null);
+})() ?? new \EmptyIterator())) ? '' : new Markup($tmp, $this->env->getCharset());
+$lines = explode("\n", $lines);
 foreach ($lines as $key => $line) {
-    echo $key > 0 ? '    ' : '' ;
-    echo "$line";
-    echo "// POSTFIX\n";
+    yield $key > 0 ? '    ' : '' ;
+    yield "$line";
+    yield "// POSTFIX\n";
 }

test/Twig/fixtures/prefix_data.php

@@ -1,9 +1,10 @@
 // line 1
-ob_start();
-echo ($context["data"] ?? null);
-$lines = explode("\n", ob_get_clean());
+$lines = ('' === $tmp = \Twig\Extension\CoreExtension::captureOutput((function () use (&$context, $macros) {
+    yield ($context["data"] ?? null);
+})() ?? new \EmptyIterator())) ? '' : new Markup($tmp, $this->env->getCharset());
+$lines = explode("\n", $lines);
 foreach ($lines as $key => $line) {
-    echo $key > 0 ? '  * ' : '* ' ;
-    echo "$line";
-    echo "\n";
+    yield $key > 0 ? '  * ' : '* ' ;
+    yield "$line";
+    yield "\n";
 }

test/Twig/fixtures/prefix_data_postfix.php

@@ -1,9 +1,10 @@
 // line 1
-ob_start();
-echo ($context["data"] ?? null);
-$lines = explode("\n", ob_get_clean());
+$lines = ('' === $tmp = \Twig\Extension\CoreExtension::captureOutput((function () use (&$context, $macros) {
+    yield ($context["data"] ?? null);
+})() ?? new \EmptyIterator())) ? '' : new Markup($tmp, $this->env->getCharset());
+$lines = explode("\n", $lines);
 foreach ($lines as $key => $line) {
-    echo $key > 0 ? '  * ' : '* ' ;
-    echo "$line";
-    echo "// POSTFIX\n";
+    yield $key > 0 ? '  * ' : '* ' ;
+    yield "$line";
+    yield "// POSTFIX\n";
 }

test/Twig/fixtures/prefix_data_text_data_postfix.php

@@ -1,11 +1,12 @@
 // line 1
-ob_start();
-echo ($context["data"] ?? null);
-echo "TEXT";
-echo ($context["data"] ?? null);
-$lines = explode("\n", ob_get_clean());
+$lines = ('' === $tmp = \Twig\Extension\CoreExtension::captureOutput((function () use (&$context, $macros) {
+    yield ($context["data"] ?? null);
+    yield "TEXT";
+    yield ($context["data"] ?? null);
+})() ?? new \EmptyIterator())) ? '' : new Markup($tmp, $this->env->getCharset());
+$lines = explode("\n", $lines);
 foreach ($lines as $key => $line) {
-    echo $key > 0 ? '  * ' : '* ' ;
-    echo "$line";
-    echo "// POSTFIX\n";
+    yield $key > 0 ? '  * ' : '* ' ;
+    yield "$line";
+    yield "// POSTFIX\n";
 }