[TASK] Simplify a condition in the workspaces DataHandlerHook

a || (b && !a) can be simplified to a || b (because the second sub-condition is only evaluated if a is false). Resolves: #97421 Releases: main, 11.5 Change-Id: I04d62fd46736bb4a0b9dfce54851aaa8f99d20e1 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/74468 Tested-by: Oliver Klee <typo3-coding@oliverklee.de> Tested-by: core-ci <typo3@b13.com> Tested-by: Stefan Bürk <stefan@buerk.tech> Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de> Reviewed-by: Stefan Bürk <stefan@buerk.tech>
TYPO3 · May 5, 2022 · 77253e4 · 77253e4
1 parent d77c966
commit 77253e4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
@@ -5860,11 +5860,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/workspaces/Classes/Domain/Record/WorkspaceRecord.php
 
-		-
-			message: "#^Negated boolean expression is always true\\.$#"
-			count: 1
-			path: ../../typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
-
 		-
 			message: "#^Offset 0 does not exist on non\\-empty\\-array\\<string, mixed\\>\\.$#"
 			count: 2

diff --git a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
@@ -374,7 +374,7 @@ public function moveRecord($table, $uid, $destPid, array $propArr, array $moveRe
         // Workspace destination check:
         // All records can be inserted if $recordMustNotBeVersionized is true.
         // Only new versions can be inserted if $recordMustNotBeVersionized is FALSE.
-        if (!($recordMustNotBeVersionized || $canMoveRecord && !$recordMustNotBeVersionized)) {
+        if (!($recordMustNotBeVersionized || $canMoveRecord)) {
             $workspaceAccessBlocked['dest1'] = 'Could not insert record from table "' . $table . '" in destination PID "' . $resolvedPid . '" ';
         }