TASK: Make linter happy

neos · May 24, 2023 · c4fa795 · c4fa795
1 parent da5a085
commit c4fa795
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/Neos.Neos/Classes/Domain/Repository/EditPreviewModeRepository.php b/Neos.Neos/Classes/Domain/Repository/EditPreviewModeRepository.php
@@ -36,7 +36,7 @@ public function findDefault(): EditPreviewMode
 
     public function findByName(string $name): EditPreviewMode
     {
-        if (array_key_exists($name,$this->editPreviewModeConfigurations)) {
+        if (array_key_exists($name, $this->editPreviewModeConfigurations)) {
             return EditPreviewMode::fromNameAndConfiguration($name, $this->editPreviewModeConfigurations[$name]);
         }
         throw new InvalidEditPreviewModeException(sprintf('"%s" is not a valid editPreviewMode', $name), 1683790077);

diff --git a/Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php b/Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php
@@ -66,13 +66,16 @@ public function uriFor(NodeAddress $nodeAddress): UriInterface
     {
         if (!$nodeAddress->isInLiveWorkspace()) {
             $request = $this->uriBuilder->getRequest();
-            if ($request->getControllerPackageKey() === 'Neos.Neos'
+            if (
+                $request->getControllerPackageKey() === 'Neos.Neos'
                 && $request->getControllerName() === "Frontend\Node"
             ) {
                 if ($request->getControllerActionName() == 'edit') {
-                    return $this->editUriFor($nodeAddress, $request->hasArgument('editPreviewMode') ? $request->getArgument('editPreviewMode') : null);
+                    $editPreviewModeArgument = $request->hasArgument('editPreviewMode') ? $request->getArgument('editPreviewMode') : null;
+                    return $this->editUriFor($nodeAddress, is_string($editPreviewModeArgument) ? $editPreviewModeArgument : null);
                 } elseif ($request->getControllerActionName() == 'preview') {
-                    return $this->previewUriFor($nodeAddress, $request->hasArgument('editPreviewMode') ? $request->getArgument('editPreviewMode') : null);
+                    $editPreviewModeArgument = $request->hasArgument('editPreviewMode') ? $request->getArgument('editPreviewMode') : null;
+                    return $this->previewUriFor($nodeAddress, is_string($editPreviewModeArgument) ? $editPreviewModeArgument : null);
                 }
             }
 

diff --git a/Neos.Neos/Classes/Fusion/Helper/BackendHelper.php b/Neos.Neos/Classes/Fusion/Helper/BackendHelper.php
@@ -57,15 +57,20 @@ public function isPreviewMode(ActionRequest $request): bool
         );
     }
 
-    public function editPreviewModeCacheIdentifier(ActionRequest $request): string
+    public function renderingModeCacheIdentifier(ActionRequest $request): string
     {
-        if ($request->getControllerPackageKey() === 'Neos.Neos'
+        if (
+            $request->getControllerPackageKey() === 'Neos.Neos'
             && $request->getControllerName() === "Frontend\Node"
             && ($request->getControllerActionName() === 'edit' || $request->getControllerActionName() === 'preview')
         ) {
-            return $request->getControllerActionName() . ($request->hasArgument('editPreviewMode') ? ':' . $request->getArgument('editPreviewMode') : '');
+            $editPreviewModeArgument = $request->hasArgument('editPreviewMode') ? $request->getArgument('editPreviewMode') : null;
+            if (is_string($editPreviewModeArgument)) {
+                return $request->getControllerActionName() . ':' . $editPreviewModeArgument;
+            }
+            return $request->getControllerActionName();
         } else {
-            return "";
+            return "show";
         }
     }
 

diff --git a/Neos.Neos/Classes/Service/LinkingService.php b/Neos.Neos/Classes/Service/LinkingService.php
@@ -370,12 +370,13 @@ public function createNodeUri(
         $uriBuilder = clone $controllerContext->getUriBuilder();
         $uriBuilder->setRequest($request);
 
-        if ($request->getControllerPackageKey() === 'Neos.Neos'
+        if (
+            $request->getControllerPackageKey() === 'Neos.Neos'
             && $request->getControllerName() === "Frontend\Node"
             && in_array($request->getControllerActionName(), ['edit', 'preview'])
         ) {
             $action = $request->getControllerActionName();
-            if ( $request->hasArgument('editPreviewMode')) {
+            if ($request->hasArgument('editPreviewMode')) {
                 $arguments['editPreviewMode'] = $request->getArgument('editPreviewMode');
             }
         } else {

diff --git a/Neos.Neos/Resources/Private/Fusion/Override/GlobalCacheIdentifiers.fusion b/Neos.Neos/Resources/Private/Fusion/Override/GlobalCacheIdentifiers.fusion
@@ -6,5 +6,5 @@
 prototype(Neos.Fusion:GlobalCacheIdentifiers) {
   workspaceChain = ${Array.join(Array.keys(Neos.Caching.getWorkspaceChain(documentNode)), ',')}
   [email protected] = ${!!documentNode}
-  editPreviewMode = ${Neos.Backend.editPreviewModeCacheIdentifier(request)}
+  renderingMode = ${Neos.Backend.renderingModeCacheIdentifier(request)}
 }