Skip to content

Commit 2a7fcf7

Browse files
committed
Remove unnecessary CombinedConditionProvider.
Implement the function `withConditionsFrom()` to transfer conditions from another provider.
1 parent 97be7f5 commit 2a7fcf7

File tree

3 files changed

+13
-39
lines changed

3 files changed

+13
-39
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,13 @@ public function getConditionTypes(): array
7878
{
7979
return $this->conditionTypes;
8080
}
81+
82+
public function withConditionsFrom(AbstractConditionProvider $provider): self
83+
{
84+
foreach ($provider->getConditionTypes() as $conditionType) {
85+
$this->addCondition($conditionType);
86+
}
87+
88+
return $this;
89+
}
8190
}

wcfsetup/install/files/lib/system/condition/provider/combined/CombinedConditionProvider.class.php

Lines changed: 0 additions & 33 deletions
This file was deleted.

wcfsetup/install/files/lib/system/condition/provider/combined/NoticeConditionProvider.class.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@
1414
*
1515
* @phpstan-import-type RequestConditionType from RequestConditionProvider
1616
* @phpstan-import-type UserConditionType from UserConditionProvider
17-
* @extends CombinedConditionProvider<UserConditionType|RequestConditionType, AbstractConditionProvider<UserConditionType>|AbstractConditionProvider<RequestConditionType>>
17+
* @extends AbstractConditionProvider<UserConditionType|RequestConditionType>
1818
*/
19-
final class NoticeConditionProvider extends CombinedConditionProvider
19+
final class NoticeConditionProvider extends AbstractConditionProvider
2020
{
2121
public function __construct()
2222
{
23-
parent::__construct(
24-
new UserConditionProvider(),
25-
new RequestConditionProvider(),
26-
);
23+
$this->withConditionsFrom(new UserConditionProvider());
24+
$this->withConditionsFrom(new RequestConditionProvider());
2725
}
2826
}

0 commit comments

Comments
 (0)