TASK: Prefer ActionRequest over ControllerContext in MenuProvider

neos · Feb 6, 2024 · 26687fa · 26687fa
1 parent 88691b5
commit 26687fa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
@@ -204,7 +204,7 @@ public function indexAction(string $node = null)
                 $this->nodeTypeGroupsAndRolesProvider->getNodeTypes(),
             'menu' =>
                 $this->menuProvider->getMenu(
-                    controllerContext: $this->controllerContext,
+                    actionRequest: $this->request,
                 ),
             'initialState' =>
                 $this->initialStateProvider->getInitialState(

diff --git a/Classes/Domain/InitialData/MenuProviderInterface.php b/Classes/Domain/InitialData/MenuProviderInterface.php
@@ -14,7 +14,7 @@
 
 namespace Neos\Neos\Ui\Domain\InitialData;
 
-use Neos\Flow\Mvc\Controller\ControllerContext;
+use Neos\Flow\Mvc\ActionRequest;
 
 /**
  * Retrieves all data needed to render the main burger menu located in the
@@ -27,5 +27,5 @@ interface MenuProviderInterface
     /**
      * @return array<int,array{label:string,icon:string,uri:string,target:string,children:array<int,array{icon:string,label:string,uri:string,position?:string,isActive:bool,target:string,skipI18n:bool}>}>
      */
-    public function getMenu(ControllerContext $controllerContext): array;
+    public function getMenu(ActionRequest $actionRequest): array;
 }
diff --git a/Classes/Infrastructure/Neos/MenuProvider.php b/Classes/Infrastructure/Neos/MenuProvider.php
@@ -15,7 +15,11 @@
 namespace Neos\Neos\Ui\Infrastructure\Neos;
 
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Mvc\ActionRequest;
+use Neos\Flow\Mvc\ActionResponse;
+use Neos\Flow\Mvc\Controller\Arguments;
 use Neos\Flow\Mvc\Controller\ControllerContext;
+use Neos\Flow\Mvc\Routing\UriBuilder;
 use Neos\Neos\Controller\Backend\MenuHelper;
 use Neos\Neos\Ui\Domain\InitialData\MenuProviderInterface;
 use Neos\Utility\PositionalArraySorter;
@@ -29,8 +33,17 @@ final class MenuProvider implements MenuProviderInterface
     #[Flow\Inject]
     protected MenuHelper $menuHelper;
 
-    public function getMenu(ControllerContext $controllerContext): array
+    public function getMenu(ActionRequest $actionRequest): array
     {
+        $uriBuilder = new UriBuilder();
+        $uriBuilder->setRequest($actionRequest);
+        $controllerContext = new ControllerContext(
+            $actionRequest,
+            new ActionResponse(),
+            new Arguments(),
+            $uriBuilder
+        );
+
         $modulesForMenu = $this->menuHelper->buildModuleList($controllerContext);
 
         $result = [];