From 08193796b7ecf810b39b32dd34c17553b2f9e29f Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 20 Oct 2024 14:11:36 +0200
Subject: [PATCH 1/8] TASK: Introduce full behat test for
 FrontendNodeController

---
 .../Bootstrap/Features/NodeCreation.php       |   2 +-
 .../Classes/Domain/Service/FusionService.php  |  12 ++
 .../Features/Bootstrap/DispatcherTrait.php    | 103 ++++++++++++++++
 .../Features/Bootstrap/FeatureContext.php     |   1 +
 .../DefaultFusionRendering.feature            | 113 ++++++++++++++++++
 5 files changed, 230 insertions(+), 1 deletion(-)
 create mode 100644 Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
 create mode 100644 Neos.Neos/Tests/Behavior/Features/FrontendNodeController/DefaultFusionRendering.feature

diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeCreation.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeCreation.php
index d20ebdab535..5f4a1b8c699 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeCreation.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeCreation.php
@@ -205,7 +205,7 @@ public function theFollowingCreateNodeAggregateWithNodeCommandsAreExecuted(Table
             if (isset($row['tetheredDescendantNodeAggregateIds'])) {
                 $command = $command->withTetheredDescendantNodeAggregateIds(NodeAggregateIdsByNodePaths::fromJsonString($row['tetheredDescendantNodeAggregateIds']));
             }
-            if (isset($row['nodeName'])) {
+            if (!empty($row['nodeName'])) {
                 $command = $command->withNodeName(NodeName::fromString($row['nodeName']));
             }
             $this->currentContentRepository->handle($command);
diff --git a/Neos.Neos/Classes/Domain/Service/FusionService.php b/Neos.Neos/Classes/Domain/Service/FusionService.php
index 528b8315a31..9573ef9befe 100644
--- a/Neos.Neos/Classes/Domain/Service/FusionService.php
+++ b/Neos.Neos/Classes/Domain/Service/FusionService.php
@@ -44,6 +44,16 @@ class FusionService
      */
     protected $fusionConfigurationCache;
 
+    private ?FusionSourceCodeCollection $additionalFusionSourceCode = null;
+
+    /**
+     * @deprecated fixme!!!
+     */
+    public function unsafeSetAdditionalFusionSourceCodeToThisSingleton(string $additionalFusionSourceCode)
+    {
+        $this->additionalFusionSourceCode = FusionSourceCodeCollection::fromString($additionalFusionSourceCode);
+    }
+
     public function createFusionConfigurationFromSite(Site $site): FusionConfiguration
     {
         return $this->fusionConfigurationCache->cacheFusionConfigurationBySite($site, function () use ($site) {
@@ -56,6 +66,8 @@ public function createFusionConfigurationFromSite(Site $site): FusionConfigurati
                     )
                     ->union(
                         FusionSourceCodeCollection::tryFromPackageRootFusion($siteResourcesPackageKey)
+                    )->union(
+                        $this->additionalFusionSourceCode ?? FusionSourceCodeCollection::empty()
                     )
             );
         });
diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
new file mode 100644
index 00000000000..56a39fa4e9e
--- /dev/null
+++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Neos.ContentRepository package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+use Behat\Gherkin\Node\PyStringNode;
+use GuzzleHttp\Psr7\Message;
+use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\CRTestSuiteRuntimeVariables;
+use Neos\Fusion\Core\Cache\ContentCache;
+use Neos\Neos\Domain\Service\FusionService;
+use PHPUnit\Framework\Assert;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestFactoryInterface;
+
+/**
+ * @internal only for behat tests within the Neos.Neos package
+ */
+trait DispatcherTrait
+{
+    use CRTestSuiteRuntimeVariables;
+
+    private ResponseInterface|null $response = null;
+
+    /**
+     * @template T of object
+     * @param class-string<T> $className
+     *
+     * @return T
+     */
+    abstract private function getObject(string $className): object;
+
+    /**
+     * @BeforeScenario
+     */
+    public function setupDispatcherTest(): void
+    {
+        $this->getObject(ContentCache::class)->flush();
+        $this->response = null;
+    }
+
+    /**
+     * @When the sites Fusion code is:
+     */
+    public function iHaveTheFollowingFusionCodeForTheSite(PyStringNode $fusionCode)
+    {
+        $this->getObject(
+            FusionService::class
+        )->unsafeSetAdditionalFusionSourceCodeToThisSingleton(
+            $fusionCode->getRaw()
+        );
+        // $fakeFusionService = new class ($original) extends \Neos\Neos\Domain\Service\FusionService
+        // {
+        //     public function __construct(
+        //         private \Neos\Neos\Domain\Service\FusionService $original,
+        //         private \Neos\Fusion\Core\FusionSourceCode $additionalFusion
+        //     ) {
+        //     }
+        //     public function createFusionConfigurationFromSite(\Neos\Neos\Domain\Model\Site $site): \Neos\Fusion\Core\FusionConfiguration
+        //     {
+        //         $this->original->createFusionConfigurationFromSite($site)-> ... doest work
+        //     }
+        // };
+    }
+
+    /**
+     * @When I dispatch the following request :requestUri
+     */
+    public function iDispatchTheFollowingRequest(string $requestUri)
+    {
+        $httpRequest = $this->getObject(ServerRequestFactoryInterface::class)->createServerRequest('GET', $requestUri);
+
+        $this->response = $this->getObject(\Neos\Flow\Http\Middleware\MiddlewaresChain::class)->handle(
+            $httpRequest
+        );
+    }
+
+    /**
+     * @Then I expect the following response header:
+     */
+    public function iExpectTheFollowingResponseHeader(PyStringNode $expectedResult): void
+    {
+        Assert::assertNotNull($this->response);
+        Assert::assertSame($expectedResult->getRaw(), $this->response->getBody()->getContents());
+    }
+
+    /**
+     * @Then I expect the following response:
+     */
+    public function iExpectTheFollowingResponse(PyStringNode $expectedResult): void
+    {
+        Assert::assertNotNull($this->response);
+        Assert::assertEquals($expectedResult->getRaw(), str_replace("\r\n", "\n", Message::toString($this->response)));
+    }
+}
diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php
index 9d06ce491eb..b02048f437e 100644
--- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php
+++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php
@@ -39,6 +39,7 @@ class FeatureContext implements BehatContext
     use CRBehavioralTestsSubjectProvider;
     use RoutingTrait;
     use MigrationsTrait;
+    use DispatcherTrait;
     use FusionTrait;
 
     use ContentCacheTrait;
diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/DefaultFusionRendering.feature b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/DefaultFusionRendering.feature
new file mode 100644
index 00000000000..cb7689bf7cb
--- /dev/null
+++ b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/DefaultFusionRendering.feature
@@ -0,0 +1,113 @@
+@flowEntities
+Feature: Test the default Fusion rendering for a request
+  Background:
+    Given using no content dimensions
+    And using the following node types:
+    """yaml
+    'Neos.ContentRepository:Root': {}
+    'Neos.Neos:ContentCollection': {}
+    'Neos.Neos:Content': {}
+    'Neos.Neos:Sites':
+      superTypes:
+        'Neos.ContentRepository:Root': true
+    'Neos.Neos:Document':
+      properties:
+        title:
+          type: string
+        uriPathSegment:
+          type: string
+    'Neos.Neos:Site':
+      superTypes:
+        'Neos.Neos:Document': true
+      childNodes:
+        main:
+          type: 'Neos.Neos:ContentCollection'
+    'Neos.Neos:Test.DocumentType':
+      superTypes:
+        'Neos.Neos:Document': true
+      childNodes:
+        main:
+          type: 'Neos.Neos:ContentCollection'
+    'Neos.Neos:Test.ContentType':
+      superTypes:
+        'Neos.Neos:Content': true
+      properties:
+        text:
+          type: string
+    """
+    And using identifier "default", I define a content repository
+    And I am in content repository "default"
+    When the command CreateRootWorkspace is executed with payload:
+      | Key                | Value           |
+      | workspaceName      | "live"          |
+      | newContentStreamId | "cs-identifier" |
+    And I am in workspace "live" and dimension space point {}
+    And the command CreateRootNodeAggregateWithNode is executed with payload:
+      | Key             | Value             |
+      | nodeAggregateId | "root"            |
+      | nodeTypeName    | "Neos.Neos:Sites" |
+    And the following CreateNodeAggregateWithNode commands are executed:
+      | nodeAggregateId | parentNodeAggregateId | nodeTypeName                | initialPropertyValues                        | tetheredDescendantNodeAggregateIds | nodeName |
+      | a               | root                  | Neos.Neos:Site              | {"title": "Node a"}                          | {}                                 | a        |
+      | a1              | a                     | Neos.Neos:Test.DocumentType | {"uriPathSegment": "a1", "title": "Node a1"} | {"main": "a-tetherton" }           |          |
+      | a1a1            | a-tetherton           | Neos.Neos:Test.ContentType  | {"text": "my first text"}                    | {}                                 |          |
+      | a1a2            | a-tetherton           | Neos.Neos:Test.ContentType  | {"text": "my second text"}                   | {}                                 |          |
+    And A site exists for node name "a" and domain "http://localhost"
+    And the sites configuration is:
+    """yaml
+    Neos:
+      Neos:
+        sites:
+          'a':
+            preset: default
+            uriPathSuffix: ''
+            contentDimensions:
+              resolver:
+                factoryClassName: Neos\Neos\FrontendRouting\DimensionResolution\Resolver\NoopResolverFactory
+    """
+
+  Scenario: Default output
+    And the sites Fusion code is:
+    """fusion
+    prototype(Neos.Neos:Test.DocumentType) < prototype(Neos.Neos:Page) {
+      body {
+        content = Neos.Fusion:Component {
+          renderer = afx`
+            {String.chr(10)}title: {node.properties.title}
+            {String.chr(10)}children: <Neos.Neos:ContentCollection nodePath='main' />
+            {String.chr(10)}
+          `
+        }
+      }
+    }
+    prototype(Neos.Neos:Test.ContentType) < prototype(Neos.Neos:ContentComponent) {
+      text = Neos.Neos:Editable {
+        property = 'text'
+      }
+
+      renderer = afx`
+        [{props.text}]
+      `
+    }
+    """
+
+    When I dispatch the following request "/a1"
+    Then I expect the following response:
+    """
+    HTTP/1.1 200 OK
+    Content-Type: text/html
+    X-Flow-Powered: Flow/dev Neos/dev
+    Content-Length: 486
+
+    <!DOCTYPE html><html>
+    <!--
+    This website is powered by Neos, the Open Source Content Application Platform licensed under the GNU/GPL.
+    Neos is based on Flow, a powerful PHP application framework licensed under the MIT license.
+
+    More information and contribution opportunities at https://www.neos.io
+    -->
+    <head><meta charset="UTF-8" /><title>Node a1</title></head><body class>
+    title: Node a1
+    children: <div class="neos-contentcollection">[my first text][my second text]</div>
+    </body></html>
+    """

From 74b5f5bf94ba039dcf2b9cd921ae5e519da2e606 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 20 Oct 2024 14:14:39 +0200
Subject: [PATCH 2/8] TASK: Fix error message in Runtime

method renderResponse was renamed to renderEntryPathWithContext
---
 Neos.Fusion/Classes/Core/Runtime.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 1d3b304187e..ba8d7d99139 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -967,7 +967,7 @@ protected function throwExceptionForUnrenderablePathIfNeeded($fusionPath, $fusio
     private function withSimulatedLegacyControllerContext(\Closure $renderer): ResponseInterface|StreamInterface
     {
         if ($this->legacyActionResponseForCurrentRendering !== null) {
-            throw new Exception('Recursion detected in `Runtime::renderResponse`. This entry point is only allowed to be invoked once per rendering.', 1706993940);
+            throw new Exception('Recursion detected in `Runtime::renderEntryPathWithContext`. This entry point is only allowed to be invoked once per rendering.', 1706993940);
         }
         $this->legacyActionResponseForCurrentRendering = new ActionResponse();
 
@@ -1017,7 +1017,7 @@ public function getControllerContext(): LegacyFusionControllerContext
         // legacy controller context layer
         $actionRequest = $this->fusionGlobals->get('request');
         if ($this->legacyActionResponseForCurrentRendering === null || !$actionRequest instanceof ActionRequest) {
-            throw new Exception(sprintf('Fusions simulated legacy controller context is only available inside `Runtime::renderResponse` and when the Fusion global "request" is an ActionRequest.'), 1706458355);
+            throw new Exception(sprintf('Fusions simulated legacy controller context is only available inside `Runtime::renderEntryPathWithContext` and when the Fusion global "request" is an ActionRequest.'), 1706458355);
         }
 
         return new LegacyFusionControllerContext(

From 805694ea56d4933f45562083d18ff564faeef6d8 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 20 Oct 2024 15:55:26 +0200
Subject: [PATCH 3/8] TASK: Add failing test for subrequest on node show action

---
 .../Features/Bootstrap/DispatcherTrait.php    |  36 +++--
 .../DefaultFusionRendering.feature            |   1 -
 .../FusionPlugin.feature                      | 148 ++++++++++++++++++
 3 files changed, 174 insertions(+), 11 deletions(-)
 create mode 100644 Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature

diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
index 56a39fa4e9e..e1fdd5ceb73 100644
--- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
+++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
@@ -71,6 +71,31 @@ public function iHaveTheFollowingFusionCodeForTheSite(PyStringNode $fusionCode)
         // };
     }
 
+    /**
+     * @When I declare the following controller :fullyQualifiedClassName:
+     */
+    public function iDeclareTheFollowingController(string $fullyQualifiedClassName, PyStringNode $expectedResult): void
+    {
+        eval($expectedResult->getRaw());
+
+        $controllerInstance = new ('\\' . $fullyQualifiedClassName)();
+
+        if ($controllerInstance instanceof \Neos\Flow\Mvc\Controller\ActionController) {
+            // inject all the necessary properties of an action controller, as extended classes dont call $this->Flow_Proxy_injectProperties();
+            \Neos\Utility\ObjectAccess::setProperty($controllerInstance, 'validatorResolver', $this->getObject(\Neos\Flow\Validation\ValidatorResolver::class), true);
+            \Neos\Utility\ObjectAccess::setProperty($controllerInstance, 'mvcPropertyMappingConfigurationService', $this->getObject(\Neos\Flow\Mvc\Controller\MvcPropertyMappingConfigurationService::class), true);
+            \Neos\Utility\ObjectAccess::setProperty($controllerInstance, 'viewConfigurationManager', $this->getObject(\Neos\Flow\Mvc\ViewConfigurationManager::class), true);
+            \Neos\Utility\ObjectAccess::setProperty($controllerInstance, 'objectManager', $this->getObject(\Neos\Flow\ObjectManagement\ObjectManager::class), true);
+        }
+
+
+        $objectManager = $this->getObject(\Neos\Flow\ObjectManagement\ObjectManager::class);
+        $objects = \Neos\Utility\ObjectAccess::getProperty($objectManager, 'objects', true);
+        $objects[get_class($controllerInstance)]['i'] = $controllerInstance;
+        $objects[get_class($controllerInstance)]['l'] = strtolower(get_class($controllerInstance));
+        $objectManager->setObjects($objects);
+    }
+
     /**
      * @When I dispatch the following request :requestUri
      */
@@ -83,21 +108,12 @@ public function iDispatchTheFollowingRequest(string $requestUri)
         );
     }
 
-    /**
-     * @Then I expect the following response header:
-     */
-    public function iExpectTheFollowingResponseHeader(PyStringNode $expectedResult): void
-    {
-        Assert::assertNotNull($this->response);
-        Assert::assertSame($expectedResult->getRaw(), $this->response->getBody()->getContents());
-    }
-
     /**
      * @Then I expect the following response:
      */
     public function iExpectTheFollowingResponse(PyStringNode $expectedResult): void
     {
         Assert::assertNotNull($this->response);
-        Assert::assertEquals($expectedResult->getRaw(), str_replace("\r\n", "\n", Message::toString($this->response)));
+        Assert::assertEquals($expectedResult->getRaw(), str_replace("\r\n", "\n", Message::toString($this->response->withoutHeader('Content-Length'))));
     }
 }
diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/DefaultFusionRendering.feature b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/DefaultFusionRendering.feature
index cb7689bf7cb..2f310073a8f 100644
--- a/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/DefaultFusionRendering.feature
+++ b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/DefaultFusionRendering.feature
@@ -97,7 +97,6 @@ Feature: Test the default Fusion rendering for a request
     HTTP/1.1 200 OK
     Content-Type: text/html
     X-Flow-Powered: Flow/dev Neos/dev
-    Content-Length: 486
 
     <!DOCTYPE html><html>
     <!--
diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
new file mode 100644
index 00000000000..3905efa1028
--- /dev/null
+++ b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
@@ -0,0 +1,148 @@
+@flowEntities
+Feature: Tests for sub-request on the frontend node controller in case of the "Neos.Neos:Plugins" Fusion prototype
+
+  Background:
+    Given using no content dimensions
+    And using the following node types:
+    """yaml
+    'Neos.ContentRepository:Root': {}
+    'Neos.Neos:Content': {}
+    'Neos.Neos:Sites':
+      superTypes:
+        'Neos.ContentRepository:Root': true
+    'Neos.Neos:Document':
+      properties:
+        title:
+          type: string
+        uriPathSegment:
+          type: string
+    'Neos.Neos:Site':
+      superTypes:
+        'Neos.Neos:Document': true
+    'Neos.Neos:Test.DocumentType':
+      superTypes:
+        Neos.Neos:Document: true
+    'Neos.Neos:Plugin':
+      superTypes:
+        'Neos.Neos:Content': true
+      abstract: true
+
+    'Neos.Neos:Content.MyPlugin':
+      superTypes:
+        'Neos.Neos:Plugin': true
+      properties:
+        'myPluginProp':
+          type: string
+          defaultValue: ''
+    """
+    And using identifier "default", I define a content repository
+    And I am in content repository "default"
+
+    When the command CreateRootWorkspace is executed with payload:
+      | Key                | Value           |
+      | workspaceName      | "live"          |
+      | newContentStreamId | "cs-identifier" |
+    And I am in workspace "live" and dimension space point {}
+    And the command CreateRootNodeAggregateWithNode is executed with payload:
+      | Key             | Value             |
+      | nodeAggregateId | "root"            |
+      | nodeTypeName    | "Neos.Neos:Sites" |
+    And the following CreateNodeAggregateWithNode commands are executed:
+      | nodeAggregateId | parentNodeAggregateId | nodeTypeName                | initialPropertyValues                        | nodeName |
+      | a               | root                  | Neos.Neos:Site              | {"title": "Node a"}                          | a        |
+      | a1              | a                     | Neos.Neos:Test.DocumentType | {"uriPathSegment": "a1", "title": "Node a1"} | a1       |
+      | a1a             | a1                    | Neos.Neos:Content.MyPlugin  | {"myPluginProp": "hello from the node"}      | a1a      |
+    And A site exists for node name "a" and domain "http://localhost"
+    And the sites configuration is:
+    """yaml
+    Neos:
+      Neos:
+        sites:
+          'a':
+            preset: default
+            uriPathSuffix: ''
+            contentDimensions:
+              resolver:
+                factoryClassName: Neos\Neos\FrontendRouting\DimensionResolution\Resolver\NoopResolverFactory
+    """
+
+  Scenario: Default output
+    When I declare the following controller 'Vendor\Site\Controller\MyPluginController':
+    """php
+    // <?php
+    namespace Vendor\Site\Controller;
+
+    use Neos\Flow\Mvc\Controller\ActionController;
+    use Neos\FluidAdaptor\View\StandaloneView;
+
+    class MyPluginController extends ActionController
+    {
+        protected $defaultViewObjectName = StandaloneView::class;
+
+        public function listAction()
+        {
+            $myPluginProp = $this->request->getInternalArgument('__myPluginProp');
+
+            $uri = $this->uriBuilder->uriFor('show', ['item' => 'hello to other'], 'MyPlugin', 'Vendor.Site');
+
+            return "list\nmyPluginProp: $myPluginProp\nuri to show: $uri";
+        }
+
+        public function showAction() // string $propToOtherAction doesnt work because the object is not proxied
+        {
+            $myPluginProp = $this->request->getInternalArgument('__myPluginProp');
+            $propToOtherAction = $this->request->getArgument('item');
+            return "details\nmyPluginProp: $myPluginProp\nargument: $propToOtherAction";
+        }
+
+        public static function getPublicActionMethods($objectManager)
+        {
+            return array_fill_keys(get_class_methods(get_called_class()), true);
+        }
+    }
+    """
+
+    When the sites Fusion code is:
+    """fusion
+    prototype(Neos.Neos:Test.DocumentType) < prototype(Neos.Fusion:Component) {
+
+      renderer = afx`
+        title: {node.properties.title}{String.chr(10)}
+        children: <Neos.Neos:ContentCase @context.node={q(node).children().get(0)} />
+      `
+    }
+
+    prototype(Neos.Neos:Content.MyPlugin) < prototype(Neos.Neos:Plugin) {
+      package = 'Vendor.Site'
+      controller = 'MyPlugin'
+      action = 'list'
+
+      myPluginProp = ${q(node).property('myPluginProp')}
+    }
+    """
+
+    When I dispatch the following request "/a1"
+    Then I expect the following response:
+    """
+    HTTP/1.1 200 OK
+    Content-Type: text/html
+    X-Flow-Powered: Flow/dev Neos/dev
+
+    title: Node a1
+    children: list
+    myPluginProp: hello from the node
+    uri to show: /a1?--neos_neos-content_myplugin%5B%40package%5D=vendor.site&--neos_neos-content_myplugin%5B%40controller%5D=myplugin&--neos_neos-content_myplugin%5B%40action%5D=show&--neos_neos-content_myplugin%5B%40format%5D=html&--neos_neos-content_myplugin%5Bitem%5D=hello+to+other
+    """
+
+    When I dispatch the following request "/a1?--neos_neos-content_myplugin%5B%40package%5D=vendor.site&--neos_neos-content_myplugin%5B%40controller%5D=myplugin&--neos_neos-content_myplugin%5B%40action%5D=show&--neos_neos-content_myplugin%5B%40format%5D=html&--neos_neos-content_myplugin%5Bitem%5D=hello+to+other"
+    Then I expect the following response:
+    """
+    HTTP/1.1 200 OK
+    Content-Type: text/html
+    X-Flow-Powered: Flow/dev Neos/dev
+
+    title: Node a1
+    children: details
+    myPluginProp: hello from the node
+    argument: hello to other
+    """

From 1c50ecdd37ca5a96165f8cba45c9b8bd49fcc6c1 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 20 Oct 2024 15:58:02 +0200
Subject: [PATCH 4/8] TASK: Hack inject properties to custom `ActionController`
 in behat

---
 .../Behavior/Features/Bootstrap/DispatcherTrait.php    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
index e1fdd5ceb73..99edd51d36b 100644
--- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
+++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
@@ -81,14 +81,12 @@ public function iDeclareTheFollowingController(string $fullyQualifiedClassName,
         $controllerInstance = new ('\\' . $fullyQualifiedClassName)();
 
         if ($controllerInstance instanceof \Neos\Flow\Mvc\Controller\ActionController) {
-            // inject all the necessary properties of an action controller, as extended classes dont call $this->Flow_Proxy_injectProperties();
-            \Neos\Utility\ObjectAccess::setProperty($controllerInstance, 'validatorResolver', $this->getObject(\Neos\Flow\Validation\ValidatorResolver::class), true);
-            \Neos\Utility\ObjectAccess::setProperty($controllerInstance, 'mvcPropertyMappingConfigurationService', $this->getObject(\Neos\Flow\Mvc\Controller\MvcPropertyMappingConfigurationService::class), true);
-            \Neos\Utility\ObjectAccess::setProperty($controllerInstance, 'viewConfigurationManager', $this->getObject(\Neos\Flow\Mvc\ViewConfigurationManager::class), true);
-            \Neos\Utility\ObjectAccess::setProperty($controllerInstance, 'objectManager', $this->getObject(\Neos\Flow\ObjectManagement\ObjectManager::class), true);
+            // run flow property injection code of parent class ActionController not ActionController_Original manually as the extended classes is not proxied and doesnt call $this->Flow_Proxy_injectProperties();
+            $ref = new \ReflectionClass(get_parent_class($controllerInstance));
+            $method = $ref->getMethod('Flow_Proxy_injectProperties');
+            $method->invoke($controllerInstance);
         }
 
-
         $objectManager = $this->getObject(\Neos\Flow\ObjectManagement\ObjectManager::class);
         $objects = \Neos\Utility\ObjectAccess::getProperty($objectManager, 'objects', true);
         $objects[get_class($controllerInstance)]['i'] = $controllerInstance;

From 235632d0110e38c9c7ca5043d24fd6c2adb53912 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 20 Oct 2024 16:00:29 +0200
Subject: [PATCH 5/8] BUGFIX: #4909 fix subrequest on show action

> Could not resolve a route and its corresponding URI for the given parameters.
---
 .../EventSourcedFrontendNodeRoutePartHandler.php         | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php b/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php
index 2b40a2a75bb..214148bb991 100644
--- a/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php
+++ b/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php
@@ -265,6 +265,15 @@ public function resolveWithParameters(array &$routeValues, RouteParameters $para
         $currentRequestSiteDetectionResult = SiteDetectionResult::fromRouteParameters($parameters);
 
         $nodeAddress = $routeValues[$this->name];
+
+        if (is_string($nodeAddress)) {
+            try {
+                $nodeAddress = NodeAddress::fromJsonString($nodeAddress);
+            } catch (\InvalidArgumentException) {
+                return false;
+            }
+        }
+
         if (!$nodeAddress instanceof NodeAddress) {
             return false;
         }

From 8b93bcc90a4fb74965928276e28642f213d888e8 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 20 Oct 2024 16:33:26 +0200
Subject: [PATCH 6/8] TASK: Add various tests different plugin controller
 usecases (redirect, forward ...)

---
 .../FusionPlugin.feature                      | 93 +++++++++++++++++--
 1 file changed, 87 insertions(+), 6 deletions(-)

diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
index 3905efa1028..bd112fd87df 100644
--- a/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
+++ b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
@@ -83,7 +83,7 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
         {
             $myPluginProp = $this->request->getInternalArgument('__myPluginProp');
 
-            $uri = $this->uriBuilder->uriFor('show', ['item' => 'hello to other'], 'MyPlugin', 'Vendor.Site');
+            $uri = $this->uriBuilder->uriFor('show', ['item' => 'hello to other']);
 
             return "list\nmyPluginProp: $myPluginProp\nuri to show: $uri";
         }
@@ -91,8 +91,29 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
         public function showAction() // string $propToOtherAction doesnt work because the object is not proxied
         {
             $myPluginProp = $this->request->getInternalArgument('__myPluginProp');
-            $propToOtherAction = $this->request->getArgument('item');
-            return "details\nmyPluginProp: $myPluginProp\nargument: $propToOtherAction";
+            $item = $this->request->getArgument('item');
+            return "details\nmyPluginProp: $myPluginProp\nargument: $item";
+        }
+
+        public function forwardAction()
+        {
+            $this->forward('show', arguments: ['item' => $this->request->getArgument('forward-item')]);
+        }
+
+        public function throwAction()
+        {
+            $this->throwStatus(500);
+        }
+
+        public function redirectAction()
+        {
+            $this->redirect('show', arguments: ['item' => $this->request->getArgument('redirect-item')]);
+        }
+
+        public function customHeaderAction()
+        {
+            $this->response->setHttpHeader('X-Custom-Plugin-Header', 'MHS');
+            return 'body contents';
         }
 
         public static function getPublicActionMethods($objectManager)
@@ -108,7 +129,8 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
 
       renderer = afx`
         title: {node.properties.title}{String.chr(10)}
-        children: <Neos.Neos:ContentCase @context.node={q(node).children().get(0)} />
+        body:{String.chr(10)}
+        <Neos.Neos:ContentCase @context.node={q(node).children().get(0)} />
       `
     }
 
@@ -129,7 +151,8 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
     X-Flow-Powered: Flow/dev Neos/dev
 
     title: Node a1
-    children: list
+    body:
+    list
     myPluginProp: hello from the node
     uri to show: /a1?--neos_neos-content_myplugin%5B%40package%5D=vendor.site&--neos_neos-content_myplugin%5B%40controller%5D=myplugin&--neos_neos-content_myplugin%5B%40action%5D=show&--neos_neos-content_myplugin%5B%40format%5D=html&--neos_neos-content_myplugin%5Bitem%5D=hello+to+other
     """
@@ -142,7 +165,65 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
     X-Flow-Powered: Flow/dev Neos/dev
 
     title: Node a1
-    children: details
+    body:
+    details
     myPluginProp: hello from the node
     argument: hello to other
     """
+
+    # forward() to items action will return the content of the other action
+    When I dispatch the following request "/a1?--neos_neos-content_myplugin%5B%40package%5D=vendor.site&--neos_neos-content_myplugin%5B%40controller%5D=myplugin&--neos_neos-content_myplugin%5B%40action%5D=forward&--neos_neos-content_myplugin%5B%40format%5D=html&--neos_neos-content_myplugin%5Bforward-item%5D=hello+to+other"
+    Then I expect the following response:
+    """
+    HTTP/1.1 200 OK
+    Content-Type: text/html
+    X-Flow-Powered: Flow/dev Neos/dev
+
+    title: Node a1
+    body:
+    details
+    myPluginProp: hello from the node
+    argument: hello to other
+    """
+
+    # throwStatus() 500 status will be upmerged and plugin will show text: 500 Internal Server Error
+    When I dispatch the following request "/a1?--neos_neos-content_myplugin%5B%40package%5D=vendor.site&--neos_neos-content_myplugin%5B%40controller%5D=myplugin&--neos_neos-content_myplugin%5B%40action%5D=throw&--neos_neos-content_myplugin%5B%40format%5D=html&--neos_neos-content_myplugin%5Bitem%5D=hello+to+other"
+    Then I expect the following response:
+    """
+    HTTP/1.1 500 Internal Server Error
+    Content-Type: text/html
+    X-Flow-Powered: Flow/dev Neos/dev
+
+    title: Node a1
+    body:
+    500 Internal Server Error
+    """
+
+    # redirect() in plugin to other action
+    When I dispatch the following request "/a1?--neos_neos-content_myplugin%5B%40package%5D=vendor.site&--neos_neos-content_myplugin%5B%40controller%5D=myplugin&--neos_neos-content_myplugin%5B%40action%5D=redirect&--neos_neos-content_myplugin%5B%40format%5D=html&--neos_neos-content_myplugin%5Bredirect-item%5D=hello+to+other"
+    # FIXME the body should be empty!
+    Then I expect the following response:
+    """
+    HTTP/1.1 303 See Other
+    Location: http://localhost/a1?--neos_neos-content_myplugin%5B%40package%5D=vendor.site&--neos_neos-content_myplugin%5B%40controller%5D=myplugin&--neos_neos-content_myplugin%5B%40action%5D=show&--neos_neos-content_myplugin%5B%40format%5D=html&--neos_neos-content_myplugin%5Bitem%5D=hello+to+other
+    Content-Type: text/html
+    X-Flow-Powered: Flow/dev Neos/dev
+
+    title: Node a1
+    body:
+
+    """
+
+    # support custom headers and upmerge those
+    When I dispatch the following request "/a1?--neos_neos-content_myplugin%5B%40package%5D=vendor.site&--neos_neos-content_myplugin%5B%40controller%5D=myplugin&--neos_neos-content_myplugin%5B%40action%5D=customHeader&--neos_neos-content_myplugin%5B%40format%5D=html"
+    Then I expect the following response:
+    """
+    HTTP/1.1 200 OK
+    X-Custom-Plugin-Header: MHS
+    Content-Type: text/html
+    X-Flow-Powered: Flow/dev Neos/dev
+
+    title: Node a1
+    body:
+    body contents
+    """

From 0985b849d4ff3f32d6e10ee19cd74d8c3a15ed52 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 20 Oct 2024 16:51:52 +0200
Subject: [PATCH 7/8] TASK: Add test for fusion plugin rendering another fusion
 view

---
 .../Features/Bootstrap/DispatcherTrait.php    | 13 ++++
 .../FusionPlugin.feature                      | 69 ++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
index 99edd51d36b..807717c30d1 100644
--- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
+++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/DispatcherTrait.php
@@ -17,6 +17,7 @@
 use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\CRTestSuiteRuntimeVariables;
 use Neos\Fusion\Core\Cache\ContentCache;
 use Neos\Neos\Domain\Service\FusionService;
+use org\bovigo\vfs\vfsStream;
 use PHPUnit\Framework\Assert;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestFactoryInterface;
@@ -47,6 +48,18 @@ public function setupDispatcherTest(): void
         $this->response = null;
     }
 
+    /**
+     * @When I have the following Fusion file :fileName:
+     */
+    public function iHaveTheFollowingFusionFile(PyStringNode $fusionCode, string $fileName)
+    {
+        if (!str_starts_with($fileName, 'vfs://fusion/')) {
+            throw new \InvalidArgumentException('Fusion file name must be virtual.');
+        }
+        vfsStream::setup('fusion');
+        file_put_contents($fileName, $fusionCode->getRaw());
+    }
+
     /**
      * @When the sites Fusion code is:
      */
diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
index bd112fd87df..fe5b56e41ed 100644
--- a/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
+++ b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
@@ -88,7 +88,7 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
             return "list\nmyPluginProp: $myPluginProp\nuri to show: $uri";
         }
 
-        public function showAction() // string $propToOtherAction doesnt work because the object is not proxied
+        public function showAction() // string $item doesnt work because the object is not proxied
         {
             $myPluginProp = $this->request->getInternalArgument('__myPluginProp');
             $item = $this->request->getArgument('item');
@@ -118,6 +118,7 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
 
         public static function getPublicActionMethods($objectManager)
         {
+            // hack, as this class is not proxied reflection doesnt work and doesnt return the desired public action methods
             return array_fill_keys(get_class_methods(get_called_class()), true);
         }
     }
@@ -227,3 +228,69 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
     body:
     body contents
     """
+
+  Scenario: Default output
+    When I have the following Fusion file "vfs://fusion/Root.fusion":
+    """
+    Vendor.Site.MyPluginWithFusionController.render = 'hello from the plugins fusion view'
+    """
+
+    When I declare the following controller 'Vendor\Site\Controller\MyPluginWithFusionController':
+    """php
+    // <?php
+    namespace Vendor\Site\Controller;
+
+    use Neos\Flow\Mvc\View\ViewInterface;
+    use Neos\Flow\Mvc\Controller\ActionController;
+    use Neos\Fusion\View\FusionView;
+
+    class MyPluginWithFusionController extends ActionController
+    {
+        protected $defaultViewObjectName = FusionView::class;
+
+        public function initializeView(ViewInterface $view)
+        {
+            $view->setOption('fusionPathPatterns', ['vfs://fusion/Root.fusion']);
+        }
+
+        public function renderAction()
+        {
+        }
+
+        public static function getPublicActionMethods($objectManager)
+        {
+            // hack, as this class is not proxied reflection doesnt work and doesnt return the desired public action methods
+            return array_fill_keys(get_class_methods(get_called_class()), true);
+        }
+    }
+    """
+
+    When the sites Fusion code is:
+    """fusion
+    prototype(Neos.Neos:Test.DocumentType) < prototype(Neos.Fusion:Component) {
+
+      renderer = afx`
+        title: {node.properties.title}{String.chr(10)}
+        body:{String.chr(10)}
+        <Neos.Neos:ContentCase @context.node={q(node).children().get(0)} />
+      `
+    }
+
+    prototype(Neos.Neos:Content.MyPlugin) < prototype(Neos.Neos:Plugin) {
+      package = 'Vendor.Site'
+      controller = 'MyPluginWithFusion'
+      action = 'render'
+    }
+    """
+
+    When I dispatch the following request "/a1"
+    Then I expect the following response:
+    """
+    HTTP/1.1 200 OK
+    Content-Type: text/html
+    X-Flow-Powered: Flow/dev Neos/dev
+
+    title: Node a1
+    body:
+    hello from the plugins fusion view
+    """

From 33eda0478cc96c9c8ba7a47d43fb9e22349d6ef3 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 20 Oct 2024 20:36:42 +0200
Subject: [PATCH 8/8] TASK: Test uri building from within fusion view inside of
 plugin

---
 .../FusionPlugin.feature                      | 60 ++++++++++++++++---
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
index fe5b56e41ed..296e61a87dc 100644
--- a/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
+++ b/Neos.Neos/Tests/Behavior/Features/FrontendNodeController/FusionPlugin.feature
@@ -51,6 +51,7 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
       | nodeAggregateId | parentNodeAggregateId | nodeTypeName                | initialPropertyValues                        | nodeName |
       | a               | root                  | Neos.Neos:Site              | {"title": "Node a"}                          | a        |
       | a1              | a                     | Neos.Neos:Test.DocumentType | {"uriPathSegment": "a1", "title": "Node a1"} | a1       |
+      | a2              | a                     | Neos.Neos:Test.DocumentType | {"uriPathSegment": "a2", "title": "Node a3"} | a3       |
       | a1a             | a1                    | Neos.Neos:Content.MyPlugin  | {"myPluginProp": "hello from the node"}      | a1a      |
     And A site exists for node name "a" and domain "http://localhost"
     And the sites configuration is:
@@ -229,10 +230,28 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
     body contents
     """
 
-  Scenario: Default output
+  Scenario: Nested Fusion view in Plugin
     When I have the following Fusion file "vfs://fusion/Root.fusion":
-    """
-    Vendor.Site.MyPluginWithFusionController.render = 'hello from the plugins fusion view'
+    """fusion
+    Vendor.Site.MyPluginWithFusionController {
+        render = 'hello from the plugins fusion view'
+
+        buildUris = Neos.Fusion:DataStructure {
+            relativeUri = Neos.Fusion:ActionUri {
+              action = 'render'
+            }
+            nodeUri = Neos.Neos:NodeUri {
+              node = ${q(node).find('#a2').get(0)}
+            }
+            uriOutsidePlugin = Neos.Fusion:ActionUri {
+              request = ${request.mainRequest}
+              package = 'Neos.Neos'
+              controller = 'Frontend\\Node'
+              action = 'preview'
+            }
+            @process.output = ${Array.join(Array.map(value, (v, k) => '  ' + k + ': ' + (v || '-')), String.chr(10))}
+        }
+    }
     """
 
     When I declare the following controller 'Vendor\Site\Controller\MyPluginWithFusionController':
@@ -250,13 +269,22 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
 
         public function initializeView(ViewInterface $view)
         {
-            $view->setOption('fusionPathPatterns', ['vfs://fusion/Root.fusion']);
+            $view->setOption('fusionPathPatterns', [
+              'resource://Neos.Fusion/Private/Fusion/Root.fusion',
+              'resource://Neos.Neos/Private/Fusion/Root.fusion',
+              'vfs://fusion/Root.fusion'
+            ]);
         }
 
         public function renderAction()
         {
         }
 
+        public function buildUrisAction()
+        {
+            $this->view->assign('node', $this->request->getInternalArgument('__node'));
+        }
+
         public static function getPublicActionMethods($objectManager)
         {
             // hack, as this class is not proxied reflection doesnt work and doesnt return the desired public action methods
@@ -272,18 +300,19 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
       renderer = afx`
         title: {node.properties.title}{String.chr(10)}
         body:{String.chr(10)}
-        <Neos.Neos:ContentCase @context.node={q(node).children().get(0)} />
+        <Neos.Neos:ContentCase @context.node={q(node).children().get(0)} />{String.chr(10)}
+        end.
       `
     }
 
     prototype(Neos.Neos:Content.MyPlugin) < prototype(Neos.Neos:Plugin) {
       package = 'Vendor.Site'
       controller = 'MyPluginWithFusion'
-      action = 'render'
+      action = ${request.arguments.pluginAction}
     }
     """
 
-    When I dispatch the following request "/a1"
+    When I dispatch the following request "/a1?pluginAction=render"
     Then I expect the following response:
     """
     HTTP/1.1 200 OK
@@ -293,4 +322,21 @@ Feature: Tests for sub-request on the frontend node controller in case of the "N
     title: Node a1
     body:
     hello from the plugins fusion view
+    end.
+    """
+
+    When I dispatch the following request "/a1?pluginAction=buildUris"
+    # for node uris the node uri builder must use the main request
+    Then I expect the following response:
+    """
+    HTTP/1.1 200 OK
+    Content-Type: text/html
+    X-Flow-Powered: Flow/dev Neos/dev
+
+    title: Node a1
+    body:
+      relativeUri: /a1?pluginAction=render&--neos_neos-content_myplugin%5B%40package%5D=vendor.site&--neos_neos-content_myplugin%5B%40controller%5D=mypluginwithfusion&--neos_neos-content_myplugin%5B%40action%5D=render&--neos_neos-content_myplugin%5B%40format%5D=html
+      nodeUri: /a2
+      uriOutsidePlugin: /neos/preview
+    end.
     """