Allow referring to outerblocks from non-nested components

Author: sneakyvv

src/TwigComponent/src/BlockStack.php

@@ -36,13 +36,6 @@ public function convert(array $blocks, int $targetEmbeddedTemplateIndex): array
             // identifies the block definition.
             $hostEmbeddedTemplateIndex = $this->findHostEmbeddedTemplateIndex();
 
-            if (0 === $hostEmbeddedTemplateIndex) {
-                // If there is no embedded template index, that means we're in a normal template.
-                // It wouldn't make sense to make these available as outer blocks,
-                // since the block is already printed in place.
-                continue;
-            }
-
             // Change the name of outer blocks to something unique so blocks of nested components aren't overridden,
             // which otherwise might cause a recursion loop when nesting components.
             $newName = self::OUTER_BLOCK_PREFIX.$blockName.'_'.mt_rand();

src/TwigComponent/tests/Fixtures/Component/BasicComponent.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\UX\TwigComponent\Tests\Fixtures\Component;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+/**
+ * @author Bart Vanderstukken <bart.vanderstukken@gmail.com>
+ */
+#[AsTwigComponent]
+final class BasicComponent
+{
+}

src/TwigComponent/tests/Fixtures/templates/base.html.twig

@@ -0,0 +1 @@
+{% block body %}{% endblock %}

src/TwigComponent/tests/Fixtures/templates/components/BasicComponent.html.twig

@@ -0,0 +1,3 @@
+<div>
+    {% block content %}{% endblock %}
+</div>

src/TwigComponent/tests/Fixtures/templates/embedded_component_blocks_outer_blocks_extended_template.html.twig

@@ -0,0 +1,9 @@
+{% extends 'base.html.twig' %}
+
+{% block foo %}Hello world!{% endblock %}
+
+{% block body %}
+<twig:BasicComponent>
+    {{ block(outerBlocks.foo) }}
+</twig:BasicComponent>
+{% endblock %}

src/TwigComponent/tests/Integration/EmbeddedComponentTest.php

@@ -80,6 +80,16 @@ public function testBlockCanBeUsedWithinNestedViaTheOuterBlocks(): void
         );
     }
 
+    /**
+     * Rule 5 bis: A block inside an extending template can be use inside a component in that template and is NOT rendered in the original location.
+     */
+    public function testBlockCanBeUsedViaTheOuterBlocks(): void
+    {
+        $output = self::getContainer()->get(Environment::class)->render('embedded_component_blocks_outer_blocks_extended_template.html.twig');
+        $this->assertStringContainsStringIgnoringIndentation('<div>Hello world!</div>', $output);
+        $this->assertStringNotContainsString("Hello world!\n<div", $output);
+    }
+
     /**
      * Rule 8: Defining a block for a component overrides any default content that block has in the component's template.
      *         This also means that when passing block down that you will lose that default content.