From 14d431646e72bc972464cc52dbd7a3206517e3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Andr=C3=A9?= <smn.andre@gmail.com>
Date: Sat, 17 Aug 2024 09:41:53 +0200
Subject: [PATCH] [TwigBridge] Render a `block` via the `#[Template]` attribute

---
 .../Bridge/Twig/Attribute/Template.php        |  2 ++
 .../TemplateAttributeListener.php             | 12 ++++++--
 .../TemplateAttributeListenerTest.php         | 29 +++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Attribute/Template.php b/src/Symfony/Bridge/Twig/Attribute/Template.php
index e265e23951f6a..ef2f193bd3674 100644
--- a/src/Symfony/Bridge/Twig/Attribute/Template.php
+++ b/src/Symfony/Bridge/Twig/Attribute/Template.php
@@ -21,11 +21,13 @@ class Template
      * @param string        $template The name of the template to render
      * @param string[]|null $vars     The controller method arguments to pass to the template
      * @param bool          $stream   Enables streaming the template
+     * @param string|null   $block    The name of the block to use in the template
      */
     public function __construct(
         public string $template,
         public ?array $vars = null,
         public bool $stream = false,
+        public ?string $block = null,
     ) {
     }
 }
diff --git a/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php b/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php
index f5962debd3e62..7220f4c4d82a2 100644
--- a/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php
+++ b/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php
@@ -55,8 +55,16 @@ public function onKernelView(ViewEvent $event): void
         }
 
         $event->setResponse($attribute->stream
-            ? new StreamedResponse(fn () => $this->twig->display($attribute->template, $parameters), $status)
-            : new Response($this->twig->render($attribute->template, $parameters), $status)
+         ? new StreamedResponse(
+             null !== $attribute->block
+             ? fn () => $this->twig->load($attribute->template)->displayBlock($attribute->block, $parameters)
+             : fn () => $this->twig->display($attribute->template, $parameters),
+             $status)
+         : new Response(
+             null !== $attribute->block
+                ? $this->twig->load($attribute->template)->renderBlock($attribute->block, $parameters)
+                : $this->twig->render($attribute->template, $parameters),
+             $status)
         );
     }
 
diff --git a/src/Symfony/Bridge/Twig/Tests/EventListener/TemplateAttributeListenerTest.php b/src/Symfony/Bridge/Twig/Tests/EventListener/TemplateAttributeListenerTest.php
index e1fb7f9575902..478f285eba5e6 100644
--- a/src/Symfony/Bridge/Twig/Tests/EventListener/TemplateAttributeListenerTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/EventListener/TemplateAttributeListenerTest.php
@@ -17,10 +17,12 @@
 use Symfony\Bridge\Twig\Tests\Fixtures\TemplateAttributeController;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Event\ViewEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Twig\Environment;
+use Twig\Loader\ArrayLoader;
 
 class TemplateAttributeListenerTest extends TestCase
 {
@@ -65,6 +67,33 @@ public function testAttribute()
         $this->assertSame('Bar', $event->getResponse()->getContent());
     }
 
+    public function testAttributeWithBlock()
+    {
+        $twig = new Environment(new ArrayLoader([
+            'foo.html.twig' => 'ERROR {% block bar %}FOOBAR{% endblock %}',
+        ]));
+
+        $request = new Request();
+        $kernel = $this->createMock(HttpKernelInterface::class);
+        $controllerArgumentsEvent = new ControllerArgumentsEvent($kernel, [new TemplateAttributeController(), 'foo'], ['Bar'], $request, null);
+        $listener = new TemplateAttributeListener($twig);
+
+        $request->attributes->set('_template', new Template('foo.html.twig', [], false, 'bar'));
+        $event = new ViewEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST, ['foo' => 'bar'], $controllerArgumentsEvent);
+        $listener->onKernelView($event);
+        $this->assertSame('FOOBAR', $event->getResponse()->getContent());
+
+        $request->attributes->set('_template', new Template('foo.html.twig', [], true, 'bar'));
+        $event = new ViewEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST, ['foo' => 'bar'], $controllerArgumentsEvent);
+        $listener->onKernelView($event);
+        $this->assertInstanceOf(StreamedResponse::class, $event->getResponse());
+
+        $request->attributes->set('_template', new Template('foo.html.twig', [], false, 'not_a_block'));
+        $event = new ViewEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST, ['foo' => 'bar'], $controllerArgumentsEvent);
+        $this->expectExceptionMessage('Block "not_a_block" on template "foo.html.twig" does not exist in "foo.html.twig".');
+        $listener->onKernelView($event);
+    }
+
     public function testForm()
     {
         $request = new Request();