Remove the new yield nodes

src/Environment.php

@@ -22,7 +22,6 @@
 use Twig\Extension\EscaperExtension;
 use Twig\Extension\ExtensionInterface;
 use Twig\Extension\OptimizerExtension;
-use Twig\Extension\YieldingExtension;
 use Twig\Loader\ArrayLoader;
 use Twig\Loader\ChainLoader;
 use Twig\Loader\LoaderInterface;
@@ -130,7 +129,6 @@ public function __construct(LoaderInterface $loader, $options = [])
         $this->addExtension(new CoreExtension());
         $this->addExtension(new EscaperExtension($options['autoescape']));
         $this->addExtension(new OptimizerExtension($options['optimizations']));
-        $this->addExtension(new YieldingExtension($options['use_yield']));
     }
 
     /**

src/Node/PrintNode.php

@@ -29,9 +29,15 @@ public function __construct(AbstractExpression $expr, int $lineno, string $tag =
 
     public function compile(Compiler $compiler): void
     {
+        $compiler->addDebugInfo($this);
+
+        if ($compiler->getEnvironment()->useYield()) {
+            $compiler->write('yield ');
+        } else {
+            $compiler->write('echo ');
+        }
+
         $compiler
-            ->addDebugInfo($this)
-            ->write('echo ')
             ->subcompile($this->getNode('expr'))
             ->raw(";\n")
         ;

src/Node/TextNode.php

@@ -28,9 +28,15 @@ public function __construct(string $data, int $lineno)
 
     public function compile(Compiler $compiler): void
     {
+        $compiler->addDebugInfo($this);
+
+        if ($compiler->getEnvironment()->useYield()) {
+            $compiler->write('yield ');
+        } else {
+            $compiler->write('echo ');
+        }
+
         $compiler
-            ->addDebugInfo($this)
-            ->write('echo ')
             ->string($this->getAttribute('data'))
             ->raw(";\n")
         ;

src/Parser.php

@@ -22,9 +22,8 @@
 use Twig\Node\Node;
 use Twig\Node\NodeCaptureInterface;
 use Twig\Node\NodeOutputInterface;
+use Twig\Node\PrintNode;
 use Twig\Node\TextNode;
-use Twig\Node\YieldExpressionNode;
-use Twig\Node\YieldTextNode;
 use Twig\TokenParser\TokenParserInterface;
 
 /**
@@ -120,14 +119,14 @@ public function subparse($test, bool $dropNeedle = false): Node
             switch ($this->getCurrentToken()->getType()) {
                 case /* Token::TEXT_TYPE */ 0:
                     $token = $this->stream->next();
-                    $rv[] = new YieldTextNode($token->getValue(), $token->getLine());
+                    $rv[] = new TextNode($token->getValue(), $token->getLine());
                     break;
 
                 case /* Token::VAR_START_TYPE */ 2:
                     $token = $this->stream->next();
                     $expr = $this->expressionParser->parseExpression();
                     $this->stream->expect(/* Token::VAR_END_TYPE */ 4);
-                    $rv[] = new YieldExpressionNode($expr, $token->getLine());
+                    $rv[] = new PrintNode($expr, $token->getLine());
                     break;
 
                 case /* Token::BLOCK_START_TYPE */ 1:

src/Test/NodeTestCase.php

@@ -19,6 +19,8 @@
 
 abstract class NodeTestCase extends TestCase
 {
+    private Environment $currentEnv;
+
     abstract public function getTests();
 
     /**
@@ -48,7 +50,7 @@ protected function getCompiler(Environment $environment = null)
 
     protected function getEnvironment()
     {
-        return new Environment(new ArrayLoader([]));
+        return $this->currentEnv = new Environment(new ArrayLoader([]));
     }
 
     protected function getVariableGetter($name, $line = false)
@@ -63,13 +65,18 @@ protected function getAttributeGetter()
         return 'CoreExtension::getAttribute($this->env, $this->source, ';
     }
 
+    protected function getEchoOrYield(): string
+    {
+        return ($this->currentEnv ?? $this->getEnvironment())->useYield() ? 'yield' : 'echo';
+    }
+
     protected function getDisplayOrYield(string $expr): string
     {
-        return sprintf($this->getEnvironment()->useYield() ? 'yield from %s->unwrap()->yield' : '%s->display', $expr);
+        return sprintf(($this->currentEnv ?? $this->getEnvironment())->useYield() ? 'yield from %s->unwrap()->yield' : '%s->display', $expr);
     }
 
     protected function getDisplayOrYieldBlock(string $expr): string
     {
-        return sprintf($this->getEnvironment()->useYield() ? 'yield from %s->unwrap()->yieldBlock' : '%s->displayBlock', $expr);
+        return sprintf(($this->currentEnv ?? $this->getEnvironment())->useYield() ? 'yield from %s->unwrap()->yieldBlock' : '%s->displayBlock', $expr);
     }
 }

src/TokenParser/ApplyTokenParser.php

@@ -13,8 +13,8 @@
 
 use Twig\Node\Expression\TempNameExpression;
 use Twig\Node\Node;
+use Twig\Node\PrintNode;
 use Twig\Node\SetNode;
-use Twig\Node\YieldExpressionNode;
 use Twig\Token;
 
 /**
@@ -44,7 +44,7 @@ public function parse(Token $token): Node
 
         return new Node([
             new SetNode(true, $ref, $body, $lineno, $this->getTag()),
-            new YieldExpressionNode($filter, $lineno, $this->getTag()),
+            new PrintNode($filter, $lineno, $this->getTag()),
         ]);
     }
 

src/TokenParser/BlockTokenParser.php

@@ -16,7 +16,7 @@
 use Twig\Node\BlockNode;
 use Twig\Node\BlockReferenceNode;
 use Twig\Node\Node;
-use Twig\Node\YieldExpressionNode;
+use Twig\Node\PrintNode;
 use Twig\Token;
 
 /**
@@ -54,7 +54,7 @@ public function parse(Token $token): Node
             }
         } else {
             $body = new Node([
-                new YieldExpressionNode($this->parser->getExpressionParser()->parseExpression(), $lineno),
+                new PrintNode($this->parser->getExpressionParser()->parseExpression(), $lineno),
             ]);
         }
         $stream->expect(/* Token::BLOCK_END_TYPE */ 3);

tests/IntegrationTest.php

@@ -18,7 +18,7 @@
 use Twig\Extension\StringLoaderExtension;
 use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Node;
-use Twig\Node\YieldExpressionNode;
+use Twig\Node\PrintNode;
 use Twig\Sandbox\SecurityPolicy;
 use Twig\Test\IntegrationTestCase;
 use Twig\Token;
@@ -135,7 +135,7 @@ public function parse(Token $token): Node
     {
         $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
 
-        return new YieldExpressionNode(new ConstantExpression('§', -1), -1);
+        return new PrintNode(new ConstantExpression('§', -1), -1);
     }
 
     public function getTag(): string

tests/Node/AutoEscapeTest.php

@@ -31,9 +31,10 @@ public function getTests()
     {
         $body = new Node([new TextNode('foo', 1)]);
         $node = new AutoEscapeNode(true, $body, 1);
+        $displayStmt = $this->getEchoOrYield();
 
         return [
-            [$node, "// line 1\necho \"foo\";"],
+            [$node, "// line 1\n$displayStmt \"foo\";"],
         ];
     }
 }

tests/Node/BlockTest.php

@@ -16,7 +16,6 @@
 use Twig\Node\BlockNode;
 use Twig\Node\Node;
 use Twig\Node\TextNode;
-use Twig\Node\YieldTextNode;
 use Twig\Test\NodeTestCase;
 
 class BlockTest extends NodeTestCase
@@ -34,7 +33,7 @@ public function getTests()
     {
         $tests = [];
 
-        $tests[] = [new BlockNode('foo', new YieldTextNode('foo', 1), 1), <<<EOF
+        $tests[] = [new BlockNode('foo', new TextNode('foo', 1), 1), <<<EOF
 // line 1
 public function block_foo(\$context, array \$blocks = [])
 {