Skip to content

Commit 97be7f5

Browse files
committed
Rename IGlobalConditionType to IContextualConditionType
1 parent 32a880c commit 97be7f5

8 files changed

+20
-20
lines changed

wcfsetup/install/files/lib/system/condition/provider/RequestConditionProvider.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace wcf\system\condition\provider;
44

5-
use wcf\system\condition\type\IGlobalConditionType;
5+
use wcf\system\condition\type\IContextualConditionType;
66
use wcf\system\condition\type\request\ActivePageRequestConditionType;
77
use wcf\system\condition\type\request\DayOfWeekRequestConditionType;
88
use wcf\system\condition\type\request\NotDayOfWeekRequestConditionType;
@@ -15,7 +15,7 @@
1515
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
1616
* @since 6.3
1717
*
18-
* @phpstan-type RequestConditionType IGlobalConditionType<mixed>
18+
* @phpstan-type RequestConditionType IContextualConditionType<mixed>
1919
* @extends AbstractConditionProvider<RequestConditionType>
2020
*/
2121
final class RequestConditionProvider extends AbstractConditionProvider

wcfsetup/install/files/lib/system/condition/type/IGlobalConditionType.class.php renamed to wcfsetup/install/files/lib/system/condition/type/IContextualConditionType.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* @template TFilter
1212
* @extends IConditionType<TFilter>
1313
*/
14-
interface IGlobalConditionType extends IConditionType
14+
interface IContextualConditionType extends IConditionType
1515
{
1616
/**
1717
* Returns `true` if the condition matches the global context (e.g., the active user via `WCF::getUser()`).

wcfsetup/install/files/lib/system/condition/type/request/ActivePageRequestConditionType.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use wcf\data\page\PageNodeTree;
66
use wcf\system\condition\type\AbstractConditionType;
7-
use wcf\system\condition\type\IGlobalConditionType;
7+
use wcf\system\condition\type\IContextualConditionType;
88
use wcf\system\condition\type\IMigrateConditionType;
99
use wcf\system\form\builder\field\SingleSelectionFormField;
1010
use wcf\system\request\RequestHandler;
@@ -15,10 +15,10 @@
1515
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
1616
* @since 6.3
1717
*
18-
* @implements IGlobalConditionType<string>
18+
* @implements IContextualConditionType<string>
1919
* @extends AbstractConditionType<string>
2020
*/
21-
final class ActivePageRequestConditionType extends AbstractConditionType implements IGlobalConditionType, IMigrateConditionType
21+
final class ActivePageRequestConditionType extends AbstractConditionType implements IContextualConditionType, IMigrateConditionType
2222
{
2323
#[\Override]
2424
public function getIdentifier(): string

wcfsetup/install/files/lib/system/condition/type/request/DayOfWeekRequestConditionType.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace wcf\system\condition\type\request;
44

55
use wcf\system\condition\type\AbstractConditionType;
6-
use wcf\system\condition\type\IGlobalConditionType;
6+
use wcf\system\condition\type\IContextualConditionType;
77
use wcf\system\condition\type\IMigrateConditionType;
88
use wcf\system\form\builder\field\SingleSelectionFormField;
99
use wcf\system\WCF;
@@ -15,10 +15,10 @@
1515
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
1616
* @since 6.3
1717
*
18-
* @implements IGlobalConditionType<string>
18+
* @implements IContextualConditionType<string>
1919
* @extends AbstractConditionType<string>
2020
*/
21-
final class DayOfWeekRequestConditionType extends AbstractConditionType implements IGlobalConditionType, IMigrateConditionType
21+
final class DayOfWeekRequestConditionType extends AbstractConditionType implements IContextualConditionType, IMigrateConditionType
2222
{
2323
#[\Override]
2424
public function getIdentifier(): string

wcfsetup/install/files/lib/system/condition/type/request/NotDayOfWeekRequestConditionType.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace wcf\system\condition\type\request;
44

55
use wcf\system\condition\type\AbstractConditionType;
6-
use wcf\system\condition\type\IGlobalConditionType;
6+
use wcf\system\condition\type\IContextualConditionType;
77
use wcf\system\condition\type\IMigrateConditionType;
88
use wcf\system\form\builder\field\SingleSelectionFormField;
99
use wcf\system\WCF;
@@ -15,10 +15,10 @@
1515
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
1616
* @since 6.3
1717
*
18-
* @implements IGlobalConditionType<string>
18+
* @implements IContextualConditionType<string>
1919
* @extends AbstractConditionType<string>
2020
*/
21-
final class NotDayOfWeekRequestConditionType extends AbstractConditionType implements IGlobalConditionType, IMigrateConditionType
21+
final class NotDayOfWeekRequestConditionType extends AbstractConditionType implements IContextualConditionType, IMigrateConditionType
2222
{
2323
#[\Override]
2424
public function getIdentifier(): string

wcfsetup/install/files/lib/system/condition/type/request/NotOnPageRequestConditionType.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use wcf\data\page\PageNodeTree;
66
use wcf\system\condition\type\AbstractConditionType;
7-
use wcf\system\condition\type\IGlobalConditionType;
7+
use wcf\system\condition\type\IContextualConditionType;
88
use wcf\system\condition\type\IMigrateConditionType;
99
use wcf\system\form\builder\field\SingleSelectionFormField;
1010
use wcf\system\request\RequestHandler;
@@ -16,10 +16,10 @@
1616
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
1717
* @since 6.3
1818
*
19-
* @implements IGlobalConditionType<string>
19+
* @implements IContextualConditionType<string>
2020
* @extends AbstractConditionType<string>
2121
*/
22-
final class NotOnPageRequestConditionType extends AbstractConditionType implements IGlobalConditionType, IMigrateConditionType
22+
final class NotOnPageRequestConditionType extends AbstractConditionType implements IContextualConditionType, IMigrateConditionType
2323
{
2424
#[\Override]
2525
public function getIdentifier(): string

wcfsetup/install/files/lib/system/condition/type/request/TimeRequestConditionType.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace wcf\system\condition\type\request;
44

55
use wcf\system\condition\type\AbstractConditionType;
6-
use wcf\system\condition\type\IGlobalConditionType;
6+
use wcf\system\condition\type\IContextualConditionType;
77
use wcf\system\condition\type\IMigrateConditionType;
88
use wcf\system\form\builder\container\condition\RowConditionFormFieldContainer;
99
use wcf\system\form\builder\field\SingleSelectionFormField;
@@ -18,10 +18,10 @@
1818
* @since 6.3
1919
*
2020
* @phpstan-type Filter = array{Condition: string, Value: string, Timezone: string}
21-
* @implements IGlobalConditionType<Filter>
21+
* @implements IContextualConditionType<Filter>
2222
* @extends AbstractConditionType<Filter>
2323
*/
24-
final class TimeRequestConditionType extends AbstractConditionType implements IGlobalConditionType, IMigrateConditionType
24+
final class TimeRequestConditionType extends AbstractConditionType implements IContextualConditionType, IMigrateConditionType
2525
{
2626
public const USER_TIMEZONE = 'userTimezone';
2727

wcfsetup/install/files/lib/system/notice/NoticeHandler.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use wcf\system\cache\eager\NoticeCache;
77
use wcf\system\condition\ConditionHandler;
88
use wcf\system\condition\provider\combined\NoticeConditionProvider;
9-
use wcf\system\condition\type\IGlobalConditionType;
9+
use wcf\system\condition\type\IContextualConditionType;
1010
use wcf\system\SingletonFactory;
1111
use wcf\system\WCF;
1212

@@ -59,7 +59,7 @@ public function getVisibleNotices()
5959

6060
$conditions = ConditionHandler::getInstance()->getConditionsWithFilter($provider, $notice->getConditions());
6161
foreach ($conditions as $condition) {
62-
$matches = $condition instanceof IGlobalConditionType
62+
$matches = $condition instanceof IContextualConditionType
6363
? $condition->matches()
6464
: $condition->matches(WCF::getUser());
6565

0 commit comments

Comments
 (0)