From 7540dd76de88843f3ea38258ab90aa7c54eb7012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20H=C3=A4u=C3=9Fler?= <elias@haeussler.dev>
Date: Sat, 25 Jan 2020 17:20:24 +0100
Subject: [PATCH] [FEATURE] Add new TypoScript condition `workspace`
A new TypoScript condition `workspace` has been added which allows
checking of several workspace parameters against a given expression.
Currently, only workspace id and state can be used within conditions.
Example:
[workspace.workspaceId === 0]
# This matches if the current workspace id equals 0
[end]
[workspace.isLive]
# This can be used to check if the current workspace is live
[end]
[workspace.isOffline]
# This can be used to check if the current workspace is offline
[end]
Resolves: #90203
Releases: master
Change-Id: I4113fc31e28c2d187f2398cc346088144d621639
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/63035
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Susanne Moog <look@susi.dev>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Susanne Moog <look@susi.dev>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
---
.../ConditionMatching/ConditionMatcher.php | 7 +
.../ConditionMatcherTest.php | 171 +++++++++++++-----
...ressionLanguageForTypoScriptConditions.rst | 8 +
...rkspaceAvailableInTypoScriptConditions.rst | 46 +++++
.../ConditionMatching/ConditionMatcher.php | 7 +
.../ConditionMatcherTest.php | 58 ++++++
6 files changed, 250 insertions(+), 47 deletions(-)
create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Feature-90203-MakeWorkspaceAvailableInTypoScriptConditions.rst
diff --git a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index fe7b6adf7ae6..4481346d87d7 100644
--- a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -61,9 +61,16 @@ class ConditionMatcher extends AbstractConditionMatcher
$backend->user->userId = $backendUserAspect->get('id');
$backend->user->userGroupList = implode(',', $backendUserAspect->get('groupIds'));
+ $workspaceAspect = $this->context->getAspect('workspace');
+ $workspace = new \stdClass();
+ $workspace->workspaceId = $workspaceAspect->get('id');
+ $workspace->isLive = $workspaceAspect->get('isLive');
+ $workspace->isOffline = $workspaceAspect->get('isOffline');
+
$this->expressionLanguageResolverVariables = [
'tree' => $tree,
'backend' => $backend,
+ 'workspace' => $workspace,
'page' => BackendUtility::getRecord('pages', $this->pageId ?? $this->determinePageId()) ?: [],
];
}
diff --git a/typo3/sysext/backend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/backend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
index f1acc61a6a11..c8526b34d064 100644
--- a/typo3/sysext/backend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
@@ -19,6 +19,8 @@ use TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatche
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Context\Context;
use TYPO3\CMS\Core\Context\UserAspect;
+use TYPO3\CMS\Core\Context\WorkspaceAspect;
+use TYPO3\CMS\Core\Log\Logger;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
@@ -28,11 +30,6 @@ use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
*/
class ConditionMatcherTest extends FunctionalTestCase
{
- /**
- * @var ConditionMatcher|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
- */
- protected $subject;
-
/**
* Sets up this test case.
*/
@@ -47,8 +44,6 @@ class ConditionMatcherTest extends FunctionalTestCase
$backendUser->user['admin'] = true;
$backendUser->groupList = '13,14,15';
GeneralUtility::makeInstance(Context::class)->setAspect('backend.user', new UserAspect($backendUser));
-
- $this->subject = new ConditionMatcher();
}
/**
@@ -58,9 +53,10 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function usergroupConditionMatchesSingleGroupId(): void
{
- self::assertTrue($this->subject->match('[usergroup(13)]'));
- self::assertTrue($this->subject->match('[usergroup("13")]'));
- self::assertTrue($this->subject->match('[usergroup(\'13\')]'));
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[usergroup(13)]'));
+ self::assertTrue($subject->match('[usergroup("13")]'));
+ self::assertTrue($subject->match('[usergroup(\'13\')]'));
}
/**
@@ -70,8 +66,9 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function usergroupConditionMatchesMultipleUserGroupId(): void
{
- self::assertTrue($this->subject->match('[usergroup("999,15,14,13")]'));
- self::assertTrue($this->subject->match('[usergroup(\'999,15,14,13\')]'));
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[usergroup("999,15,14,13")]'));
+ self::assertTrue($subject->match('[usergroup(\'999,15,14,13\')]'));
}
/**
@@ -81,8 +78,9 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function loginUserConditionMatchesAnyLoggedInUser(): void
{
- self::assertTrue($this->subject->match('[loginUser("*")]'));
- self::assertTrue($this->subject->match('[loginUser(\'*\')]'));
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[loginUser("*")]'));
+ self::assertTrue($subject->match('[loginUser(\'*\')]'));
}
/**
@@ -92,9 +90,10 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function loginUserConditionMatchesSingleLoggedInUser(): void
{
- self::assertTrue($this->subject->match('[loginUser(13)]'));
- self::assertTrue($this->subject->match('[loginUser("13")]'));
- self::assertTrue($this->subject->match('[loginUser(\'13\')]'));
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[loginUser(13)]'));
+ self::assertTrue($subject->match('[loginUser("13")]'));
+ self::assertTrue($subject->match('[loginUser(\'13\')]'));
}
/**
@@ -105,9 +104,10 @@ class ConditionMatcherTest extends FunctionalTestCase
public function loginUserConditionDoesNotMatchSingleLoggedInUser(): void
{
$GLOBALS['BE_USER']->user['uid'] = 13;
- self::assertFalse($this->subject->match('[loginUser(999)]'));
- self::assertFalse($this->subject->match('[loginUser("999")]'));
- self::assertFalse($this->subject->match('[loginUser(\'999\')]'));
+ $subject = $this->getConditionMatcher();
+ self::assertFalse($subject->match('[loginUser(999)]'));
+ self::assertFalse($subject->match('[loginUser("999")]'));
+ self::assertFalse($subject->match('[loginUser(\'999\')]'));
}
/**
@@ -117,8 +117,9 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function loginUserConditionMatchesMultipleLoggedInUsers(): void
{
- self::assertTrue($this->subject->match('[loginUser("999,13")]'));
- self::assertTrue($this->subject->match('[loginUser(\'999,13\')]'));
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[loginUser("999,13")]'));
+ self::assertTrue($subject->match('[loginUser(\'999,13\')]'));
}
/**
@@ -128,9 +129,57 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function adminUserConditionMatchesAdminUser(): void
{
- self::assertTrue($this->subject->match('[backend.user.isAdmin == true]'));
- self::assertTrue($this->subject->match('[backend.user.isAdmin != false]'));
- self::assertTrue($this->subject->match('[backend.user.isAdmin]'));
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[backend.user.isAdmin == true]'));
+ self::assertTrue($subject->match('[backend.user.isAdmin != false]'));
+ self::assertTrue($subject->match('[backend.user.isAdmin]'));
+ }
+
+ /**
+ * Tests whether checking for workspace id matches current workspace id
+ *
+ * @test
+ */
+ public function workspaceIdConditionMatchesCurrentWorkspaceId(): void
+ {
+ $this->setUpWorkspaceAspect(0);
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[workspace.workspaceId === 0]'));
+ self::assertTrue($subject->match('[workspace.workspaceId == 0]'));
+ self::assertTrue($subject->match('[workspace.workspaceId == "0"]'));
+ self::assertTrue($subject->match('[workspace.workspaceId == \'0\']'));
+ }
+
+ /**
+ * Tests whether checking if workspace is live matches
+ *
+ * @test
+ */
+ public function workspaceIsLiveMatchesCorrectWorkspaceState(): void
+ {
+ $this->setUpWorkspaceAspect(1);
+ $subject = $this->getConditionMatcher();
+ self::assertFalse($subject->match('[workspace.isLive]'));
+ self::assertFalse($subject->match('[workspace.isLive === true]'));
+ self::assertFalse($subject->match('[workspace.isLive == true]'));
+ self::assertFalse($subject->match('[workspace.isLive !== false]'));
+ self::assertFalse($subject->match('[workspace.isLive != false]'));
+ }
+
+ /**
+ * Tests whether checking if workspace is offline matches
+ *
+ * @test
+ */
+ public function workspaceIsOfflineMatchesCorrectWorkspaceState(): void
+ {
+ $this->setUpWorkspaceAspect(1);
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[workspace.isOffline]'));
+ self::assertTrue($subject->match('[workspace.isOffline === true]'));
+ self::assertTrue($subject->match('[workspace.isOffline == true]'));
+ self::assertTrue($subject->match('[workspace.isOffline !== false]'));
+ self::assertTrue($subject->match('[workspace.isOffline != false]'));
}
/**
@@ -140,8 +189,8 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function treeLevelConditionMatchesSingleValue(): void
{
- $this->subject->__construct(null, 2);
- self::assertTrue($this->subject->match('[tree.level == 2]'));
+ $subject = $this->getConditionMatcher(2);
+ self::assertTrue($subject->match('[tree.level == 2]'));
}
/**
@@ -151,8 +200,8 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function treeLevelConditionMatchesMultipleValues(): void
{
- $this->subject->__construct(null, 2);
- self::assertTrue($this->subject->match('[tree.level in [999,998,2]]'));
+ $subject = $this->getConditionMatcher(2);
+ self::assertTrue($subject->match('[tree.level in [999,998,2]]'));
}
/**
@@ -162,7 +211,8 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function treeLevelConditionDoesNotMatchFaultyValue(): void
{
- self::assertFalse($this->subject->match('[tree.level == 999]'));
+ $subject = $this->getConditionMatcher();
+ self::assertFalse($subject->match('[tree.level == 999]'));
}
/**
@@ -172,7 +222,7 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function PIDupinRootlineConditionMatchesSinglePageIdInRootline(): void
{
- $subject = new ConditionMatcher(null, 3);
+ $subject = $this->getConditionMatcher(3);
self::assertTrue($subject->match('[2 in tree.rootLineParentIds]'));
self::assertTrue($subject->match('["2" in tree.rootLineParentIds]'));
self::assertTrue($subject->match('[\'2\' in tree.rootLineParentIds]'));
@@ -185,7 +235,7 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function PIDupinRootlineConditionDoesNotMatchLastPageIdInRootline(): void
{
- $subject = new ConditionMatcher(null, 3);
+ $subject = $this->getConditionMatcher(3);
self::assertFalse($subject->match('[3 in tree.rootLineParentIds]'));
}
@@ -196,7 +246,7 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function PIDupinRootlineConditionDoesNotMatchPageIdNotInRootline(): void
{
- $subject = new ConditionMatcher(null, 3);
+ $subject = $this->getConditionMatcher(3);
self::assertFalse($subject->match('[999 in tree.rootLineParentIds]'));
}
@@ -207,7 +257,7 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function PIDinRootlineConditionMatchesSinglePageIdInRootline(): void
{
- $subject = new ConditionMatcher(null, 3);
+ $subject = $this->getConditionMatcher(3);
self::assertTrue($subject->match('[2 in tree.rootLineIds]'));
}
@@ -218,7 +268,7 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function PIDinRootlineConditionMatchesLastPageIdInRootline(): void
{
- $subject = new ConditionMatcher(null, 3);
+ $subject = $this->getConditionMatcher(3);
self::assertTrue($subject->match('[3 in tree.rootLineIds]'));
}
@@ -229,7 +279,7 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function PIDinRootlineConditionDoesNotMatchPageIdNotInRootline(): void
{
- $subject = new ConditionMatcher(null, 3);
+ $subject = $this->getConditionMatcher(3);
self::assertFalse($subject->match('[999 in tree.rootLineIds]'));
}
@@ -241,9 +291,10 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function compatVersionConditionMatchesOlderRelease(): void
{
- self::assertTrue($this->subject->match('[compatVersion(7.0)]'));
- self::assertTrue($this->subject->match('[compatVersion("7.0")]'));
- self::assertTrue($this->subject->match('[compatVersion(\'7.0\')]'));
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[compatVersion(7.0)]'));
+ self::assertTrue($subject->match('[compatVersion("7.0")]'));
+ self::assertTrue($subject->match('[compatVersion(\'7.0\')]'));
}
/**
@@ -254,9 +305,10 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function compatVersionConditionMatchesSameRelease(): void
{
- self::assertTrue($this->subject->match('[compatVersion(' . TYPO3_branch . ')]'));
- self::assertTrue($this->subject->match('[compatVersion("' . TYPO3_branch . '")]'));
- self::assertTrue($this->subject->match('[compatVersion(\'' . TYPO3_branch . '\')]'));
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[compatVersion(' . TYPO3_branch . ')]'));
+ self::assertTrue($subject->match('[compatVersion("' . TYPO3_branch . '")]'));
+ self::assertTrue($subject->match('[compatVersion(\'' . TYPO3_branch . '\')]'));
}
/**
@@ -267,9 +319,10 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function compatVersionConditionDoesNotMatchNewerRelease(): void
{
- self::assertFalse($this->subject->match('[compatVersion(15.0)]'));
- self::assertFalse($this->subject->match('[compatVersion("15.0")]'));
- self::assertFalse($this->subject->match('[compatVersion(\'15.0\')]'));
+ $subject = $this->getConditionMatcher();
+ self::assertFalse($subject->match('[compatVersion(15.0)]'));
+ self::assertFalse($subject->match('[compatVersion("15.0")]'));
+ self::assertFalse($subject->match('[compatVersion(\'15.0\')]'));
}
/**
@@ -281,7 +334,8 @@ class ConditionMatcherTest extends FunctionalTestCase
{
$testKey = StringUtility::getUniqueId('test');
putenv($testKey . '=testValue');
- self::assertTrue($this->subject->match('[getenv("' . $testKey . '") == "testValue"]'));
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[getenv("' . $testKey . '") == "testValue"]'));
}
/**
@@ -289,6 +343,29 @@ class ConditionMatcherTest extends FunctionalTestCase
*/
public function usingTSFEInATestInBeContextIsAlwaysFalse(): void
{
- self::assertFalse($this->subject->match('[getTSFE().id == 1]'));
+ $subject = $this->getConditionMatcher();
+ self::assertFalse($subject->match('[getTSFE().id == 1]'));
+ }
+
+ /**
+ * @param int|null $pageId
+ * @return ConditionMatcher
+ */
+ protected function getConditionMatcher(int $pageId = null): ConditionMatcher
+ {
+ $conditionMatcher = new ConditionMatcher(null, $pageId);
+ $conditionMatcher->setLogger($this->prophesize(Logger::class)->reveal());
+
+ return $conditionMatcher;
+ }
+
+ /**
+ * Set up workspace aspect.
+ *
+ * @param int $workspaceId
+ */
+ protected function setUpWorkspaceAspect(int $workspaceId): void
+ {
+ GeneralUtility::makeInstance(Context::class)->setAspect('workspace', new WorkspaceAspect($workspaceId));
}
}
diff --git a/typo3/sysext/core/Documentation/Changelog/9.4/Feature-85829-ImplementSymfonyExpressionLanguageForTypoScriptConditions.rst b/typo3/sysext/core/Documentation/Changelog/9.4/Feature-85829-ImplementSymfonyExpressionLanguageForTypoScriptConditions.rst
index 9c5f236c2af9..57a11723e0ea 100644
--- a/typo3/sysext/core/Documentation/Changelog/9.4/Feature-85829-ImplementSymfonyExpressionLanguageForTypoScriptConditions.rst
+++ b/typo3/sysext/core/Documentation/Changelog/9.4/Feature-85829-ImplementSymfonyExpressionLanguageForTypoScriptConditions.rst
@@ -111,6 +111,14 @@ The following variables are available. The values are context related.
| | | |
| .user.userGroupList | String | comma list of group UIDs |
+---------------------+------------+------------------------------------------------------------------------------+
+| workspace | Object | object with workspace information |
+| | | |
+| .workspaceId | Integer | id of current workspace |
+| | | |
+| .isLive | Boolean | true if current workspace is live |
+| | | |
+| .isOffline | Boolean | true if current workspace is offline |
++---------------------+------------+------------------------------------------------------------------------------+
| typo3 | Object | object with TYPO3 related information |
| | | |
| .version | String | TYPO3_version (e.g. 9.4.0-dev) |
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-90203-MakeWorkspaceAvailableInTypoScriptConditions.rst b/typo3/sysext/core/Documentation/Changelog/master/Feature-90203-MakeWorkspaceAvailableInTypoScriptConditions.rst
new file mode 100644
index 000000000000..49a207eaa2f8
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Feature-90203-MakeWorkspaceAvailableInTypoScriptConditions.rst
@@ -0,0 +1,46 @@
+.. include:: ../../Includes.txt
+
+===================================================================
+Feature: #90203 - Make workspace available in TypoScript conditions
+===================================================================
+
+See :issue:`90203`
+
+Description
+===========
+
+A new TypoScript expression language variable `workspace` has been added.
+It can be used to match a given expression against common workspace parameters.
+
+Currently, the parameters `workspaceId`, `isLive` and `isOffline` are supported.
+
+Examples
+--------
+
+Match the current workspace id:
+
+.. code-block:: ts
+
+ [workspace.workspaceId === 3]
+ # Current workspace id equals: 3
+ [end]
+
+Match against current workspace state:
+
+.. code-block:: ts
+
+ [workspace.isLive]
+ # Current workspace is live
+ [end]
+
+ [workspace.isOffline]
+ # Current workspace is offline
+ [end]
+
+
+Impact
+======
+
+The new feature allows matching against several workspace parameters within TypoScript.
+
+.. index:: TypoScript
\ No newline at end of file
diff --git a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index 2a0b2f0e750f..188a75ef5709 100644
--- a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -60,9 +60,16 @@ class ConditionMatcher extends AbstractConditionMatcher
$frontend->user->userId = $frontendUserAspect->get('id');
$frontend->user->userGroupList = implode(',', $frontendUserAspect->get('groupIds'));
+ $workspaceAspect = $this->context->getAspect('workspace');
+ $workspace = new \stdClass();
+ $workspace->workspaceId = $workspaceAspect->get('id');
+ $workspace->isLive = $workspaceAspect->get('isLive');
+ $workspace->isOffline = $workspaceAspect->get('isOffline');
+
$this->expressionLanguageResolverVariables = [
'tree' => $tree,
'frontend' => $frontend,
+ 'workspace' => $workspace,
'page' => $GLOBALS['TSFE']->page ?? [],
];
}
diff --git a/typo3/sysext/frontend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/frontend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
index a96e7ea8ec16..f5e1775450c3 100644
--- a/typo3/sysext/frontend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
@@ -18,6 +18,7 @@ namespace TYPO3\CMS\Frontend\Tests\Functional\Configuration\TypoScript\Condition
use Prophecy\Argument;
use TYPO3\CMS\Core\Context\Context;
use TYPO3\CMS\Core\Context\UserAspect;
+use TYPO3\CMS\Core\Context\WorkspaceAspect;
use TYPO3\CMS\Core\Domain\Repository\PageRepository;
use TYPO3\CMS\Core\Http\ServerRequest;
use TYPO3\CMS\Core\Log\Logger;
@@ -159,6 +160,53 @@ class ConditionMatcherTest extends FunctionalTestCase
self::assertTrue($subject->match('[loginUser("*") == false]'));
}
+ /**
+ * Tests whether checking for workspace id matches current workspace id
+ *
+ * @test
+ */
+ public function workspaceIdConditionMatchesCurrentWorkspaceId(): void
+ {
+ $this->setUpWorkspaceAspect(0);
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[workspace.workspaceId === 0]'));
+ self::assertTrue($subject->match('[workspace.workspaceId == 0]'));
+ self::assertTrue($subject->match('[workspace.workspaceId == "0"]'));
+ self::assertTrue($subject->match('[workspace.workspaceId == \'0\']'));
+ }
+
+ /**
+ * Tests whether checking if workspace is live matches
+ *
+ * @test
+ */
+ public function workspaceIsLiveMatchesCorrectWorkspaceState(): void
+ {
+ $this->setUpWorkspaceAspect(1);
+ $subject = $this->getConditionMatcher();
+ self::assertFalse($subject->match('[workspace.isLive]'));
+ self::assertFalse($subject->match('[workspace.isLive === true]'));
+ self::assertFalse($subject->match('[workspace.isLive == true]'));
+ self::assertFalse($subject->match('[workspace.isLive !== false]'));
+ self::assertFalse($subject->match('[workspace.isLive != false]'));
+ }
+
+ /**
+ * Tests whether checking if workspace is offline matches
+ *
+ * @test
+ */
+ public function workspaceIsOfflineMatchesCorrectWorkspaceState(): void
+ {
+ $this->setUpWorkspaceAspect(1);
+ $subject = $this->getConditionMatcher();
+ self::assertTrue($subject->match('[workspace.isOffline]'));
+ self::assertTrue($subject->match('[workspace.isOffline === true]'));
+ self::assertTrue($subject->match('[workspace.isOffline == true]'));
+ self::assertTrue($subject->match('[workspace.isOffline !== false]'));
+ self::assertTrue($subject->match('[workspace.isOffline != false]'));
+ }
+
/**
* Tests whether treeLevel comparison matches.
*
@@ -452,6 +500,16 @@ class ConditionMatcherTest extends FunctionalTestCase
GeneralUtility::makeInstance(Context::class)->setAspect('frontend.user', new UserAspect($frontendUser, $groups));
}
+ /**
+ * Set up workspace aspect.
+ *
+ * @param int $workspaceId
+ */
+ protected function setUpWorkspaceAspect(int $workspaceId): void
+ {
+ GeneralUtility::makeInstance(Context::class)->setAspect('workspace', new WorkspaceAspect($workspaceId));
+ }
+
/**
* @param int $pageId
*/
--
GitLab