From 68f90f00300fce40a9c89ef72cdf9a525313809e Mon Sep 17 00:00:00 2001 From: Paula Kallert Date: Tue, 23 Jul 2024 16:33:14 +0200 Subject: [PATCH 1/5] Fix: Switch workspace --- .../Classes/Feature/WorkspaceCommandHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php index 1e96149f95f..d35b648df90 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php @@ -962,7 +962,7 @@ private function requireNonCircularRelationBetweenWorkspaces(Workspace $workspac } $nextBaseWorkspace = $baseWorkspace; - while ($nextBaseWorkspace->baseWorkspaceName !== null) { + while ($nextBaseWorkspace->baseWorkspaceName->value !== 'live') { if ($workspace->workspaceName->equals($nextBaseWorkspace->baseWorkspaceName)) { throw new CircularRelationBetweenWorkspacesException(sprintf('The workspace "%s" is already on the path of the target workspace "%s".', $workspace->workspaceName->value, $baseWorkspace->workspaceName->value)); } From a14ffe991468fccde05460cd7d9160cccb34562d Mon Sep 17 00:00:00 2001 From: Paula Kallert Date: Tue, 23 Jul 2024 17:08:10 +0200 Subject: [PATCH 2/5] Feature: Also check for isLive --- .../Classes/Feature/WorkspaceCommandHandler.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php index d35b648df90..34696bd2959 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php @@ -960,13 +960,18 @@ private function requireNonCircularRelationBetweenWorkspaces(Workspace $workspac if ($workspace->workspaceName->equals($baseWorkspace->workspaceName)) { throw new BaseWorkspaceEqualsWorkspaceException(sprintf('The base workspace of the target must be different from the given workspace "%s".', $workspace->workspaceName->value)); } - + $count = 1; $nextBaseWorkspace = $baseWorkspace; - while ($nextBaseWorkspace->baseWorkspaceName->value !== 'live') { + while (!is_null($nextBaseWorkspace->baseWorkspaceName) && !$nextBaseWorkspace->baseWorkspaceName->isLive()) { if ($workspace->workspaceName->equals($nextBaseWorkspace->baseWorkspaceName)) { throw new CircularRelationBetweenWorkspacesException(sprintf('The workspace "%s" is already on the path of the target workspace "%s".', $workspace->workspaceName->value, $baseWorkspace->workspaceName->value)); } $nextBaseWorkspace = $this->requireBaseWorkspace($workspace, $workspaceFinder); + $count++; + if($count == 5){ + die(); + } + var_dump($nextBaseWorkspace->baseWorkspaceName); } } From 7e5338f512771a498f3548a52dffcfcfbcc41300 Mon Sep 17 00:00:00 2001 From: Paula Kallert Date: Tue, 23 Jul 2024 17:09:14 +0200 Subject: [PATCH 3/5] Feature: Remove debug output --- .../Classes/Feature/WorkspaceCommandHandler.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php index 34696bd2959..77e1a5be1d1 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php @@ -960,18 +960,12 @@ private function requireNonCircularRelationBetweenWorkspaces(Workspace $workspac if ($workspace->workspaceName->equals($baseWorkspace->workspaceName)) { throw new BaseWorkspaceEqualsWorkspaceException(sprintf('The base workspace of the target must be different from the given workspace "%s".', $workspace->workspaceName->value)); } - $count = 1; $nextBaseWorkspace = $baseWorkspace; while (!is_null($nextBaseWorkspace->baseWorkspaceName) && !$nextBaseWorkspace->baseWorkspaceName->isLive()) { if ($workspace->workspaceName->equals($nextBaseWorkspace->baseWorkspaceName)) { throw new CircularRelationBetweenWorkspacesException(sprintf('The workspace "%s" is already on the path of the target workspace "%s".', $workspace->workspaceName->value, $baseWorkspace->workspaceName->value)); } $nextBaseWorkspace = $this->requireBaseWorkspace($workspace, $workspaceFinder); - $count++; - if($count == 5){ - die(); - } - var_dump($nextBaseWorkspace->baseWorkspaceName); } } From 3472c61802d9ef89b44387bbacc8297949243b5b Mon Sep 17 00:00:00 2001 From: Paula Kallert Date: Tue, 23 Jul 2024 22:46:37 +0200 Subject: [PATCH 4/5] Feature: use nextBaseWorkspace in while loop --- .../Classes/Feature/WorkspaceCommandHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php index 77e1a5be1d1..3789512c04d 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php @@ -961,11 +961,11 @@ private function requireNonCircularRelationBetweenWorkspaces(Workspace $workspac throw new BaseWorkspaceEqualsWorkspaceException(sprintf('The base workspace of the target must be different from the given workspace "%s".', $workspace->workspaceName->value)); } $nextBaseWorkspace = $baseWorkspace; - while (!is_null($nextBaseWorkspace->baseWorkspaceName) && !$nextBaseWorkspace->baseWorkspaceName->isLive()) { + while (!is_null($nextBaseWorkspace->baseWorkspaceName)) { if ($workspace->workspaceName->equals($nextBaseWorkspace->baseWorkspaceName)) { throw new CircularRelationBetweenWorkspacesException(sprintf('The workspace "%s" is already on the path of the target workspace "%s".', $workspace->workspaceName->value, $baseWorkspace->workspaceName->value)); } - $nextBaseWorkspace = $this->requireBaseWorkspace($workspace, $workspaceFinder); + $nextBaseWorkspace = $this->requireBaseWorkspace($nextBaseWorkspace, $workspaceFinder); } } From 7c08e3720fb1a3fbd5ca3876482a2943a5d14d8e Mon Sep 17 00:00:00 2001 From: Jenkins Date: Fri, 26 Jul 2024 18:59:57 +0000 Subject: [PATCH 5/5] TASK: Update references [skip ci] --- .../References/CommandReference.rst | 2 +- .../References/ViewHelpers/FluidAdaptor.rst | 2 +- .../References/ViewHelpers/Form.rst | 2 +- .../References/ViewHelpers/Media.rst | 2 +- .../References/ViewHelpers/Neos.rst | 2 +- .../References/ViewHelpers/TYPO3Fluid.rst | 34 +++++++++---------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Neos.Neos/Documentation/References/CommandReference.rst b/Neos.Neos/Documentation/References/CommandReference.rst index 61107fca756..35babf7b40d 100644 --- a/Neos.Neos/Documentation/References/CommandReference.rst +++ b/Neos.Neos/Documentation/References/CommandReference.rst @@ -19,7 +19,7 @@ commands that may be available, use:: ./flow help -The following reference was automatically generated from code on 2024-07-16 +The following reference was automatically generated from code on 2024-07-26 .. _`Neos Command Reference: NEOS.FLOW`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst index 9ba1c6fac69..793fe5e0703 100644 --- a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst +++ b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst @@ -3,7 +3,7 @@ FluidAdaptor ViewHelper Reference ################################# -This reference was automatically generated from code on 2024-07-16 +This reference was automatically generated from code on 2024-07-26 .. _`FluidAdaptor ViewHelper Reference: f:debug`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst index d3fc3eb8bfc..559b2d80bdf 100644 --- a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst +++ b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst @@ -3,7 +3,7 @@ Form ViewHelper Reference ######################### -This reference was automatically generated from code on 2024-07-16 +This reference was automatically generated from code on 2024-07-26 .. _`Form ViewHelper Reference: neos.form:form`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst index 53c41c6a097..24517ceb99e 100644 --- a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst +++ b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst @@ -3,7 +3,7 @@ Media ViewHelper Reference ########################## -This reference was automatically generated from code on 2024-07-16 +This reference was automatically generated from code on 2024-07-26 .. _`Media ViewHelper Reference: neos.media:fileTypeIcon`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst index 980f3a2c51e..31b9af9340c 100644 --- a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst +++ b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst @@ -3,7 +3,7 @@ Neos ViewHelper Reference ######################### -This reference was automatically generated from code on 2024-07-16 +This reference was automatically generated from code on 2024-07-26 .. _`Neos ViewHelper Reference: neos:backend.authenticationProviderLabel`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst index 15df07cd4c3..f8d4d81745e 100644 --- a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst +++ b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst @@ -3,7 +3,7 @@ TYPO3 Fluid ViewHelper Reference ################################ -This reference was automatically generated from code on 2024-07-16 +This reference was automatically generated from code on 2024-07-26 .. _`TYPO3 Fluid ViewHelper Reference: f:alias`: @@ -525,11 +525,11 @@ Output:: Arguments ********* -* ``typeOnly`` (boolean, *optional*): If TRUE, debugs only the type of variables +* ``typeOnly`` (boolean, *optional*): If true, debugs only the type of variables * ``levels`` (integer, *optional*): Levels to render when rendering nested objects/arrays -* ``html`` (boolean, *optional*): Render HTML. If FALSE, output is indented plaintext +* ``html`` (boolean, *optional*): Render HTML. If false, output is indented plaintext @@ -571,8 +571,8 @@ Output content if condition is not met Output:: - Everything inside the "else" tag is displayed if the condition evaluates to FALSE. - Otherwise nothing is outputted in this example. + Everything inside the "else" tag is displayed if the condition evaluates to false. + Otherwise, nothing is outputted in this example. :Implementation: TYPO3Fluid\\Fluid\\ViewHelpers\\ElseViewHelper @@ -696,7 +696,7 @@ Arguments * ``key`` (string, *optional*): Variable to assign array key to -* ``reverse`` (boolean, *optional*): If TRUE, iterates in reverse +* ``reverse`` (boolean, *optional*): If true, iterates in reverse * ``iteration`` (string, *optional*): The name of the variable to store iteration information (index, cycle, total, isFirst, isLast, isEven, isOdd) @@ -876,11 +876,11 @@ Arguments * ``value`` (string, *optional*): Value to format -* ``keepQuotes`` (boolean, *optional*): If TRUE quotes will not be replaced (ENT_NOQUOTES) +* ``keepQuotes`` (boolean, *optional*): If true quotes will not be replaced (ENT_NOQUOTES) * ``encoding`` (string, *optional*): Encoding -* ``doubleEncode`` (boolean, *optional*): If FALSE html entities will not be encoded +* ``doubleEncode`` (boolean, *optional*): If false, html entities will not be encoded @@ -1528,7 +1528,7 @@ Basic usage Output:: - Everything inside the tag is being displayed if the condition evaluates to TRUE. + Everything inside the tag is being displayed if the condition evaluates to true. If / then / else ---------------- @@ -1540,13 +1540,13 @@ If / then / else This is being shown in case the condition matches. - This is being displayed in case the condition evaluates to FALSE. + This is being displayed in case the condition evaluates to false. Output:: - Everything inside the "then" tag is displayed if the condition evaluates to TRUE. + Everything inside the "then" tag is displayed if the condition evaluates to true. Otherwise, everything inside the "else" tag is displayed. Inline notation @@ -1558,7 +1558,7 @@ Inline notation Output:: - The value of the "then" attribute is displayed if the condition evaluates to TRUE. + The value of the "then" attribute is displayed if the condition evaluates to true. Otherwise, everything the value of the "else" attribute is displayed. Combining multiple conditions @@ -1571,17 +1571,17 @@ Combining multiple conditions This is being shown in case both conditions match. - This is being displayed in case the first block of the condition evaluates to TRUE and any condition in - the second condition block evaluates to TRUE. + This is being displayed in case the first block of the condition evaluates to true and any condition in + the second condition block evaluates to true. - This is being displayed when none of the above conditions evaluated to TRUE. + This is being displayed when none of the above conditions evaluated to true. Output:: - Depending on which expression evaluated to TRUE, that value is displayed. + Depending on which expression evaluated to true, that value is displayed. If no expression matched, the contents inside the final "else" tag are displayed. :Implementation: TYPO3Fluid\\Fluid\\ViewHelpers\\IfViewHelper @@ -1919,7 +1919,7 @@ Arguments * ``arguments`` (array, *optional*): Array of variables to be transferred. Use {_all} for all variables -* ``optional`` (boolean, *optional*): If TRUE, considers the *section* optional. Partial never is. +* ``optional`` (boolean, *optional*): If true, considers the *section* optional. Partial never is. * ``default`` (mixed, *optional*): Value (usually string) to be displayed if the section or partial does not exist