Allow any type as a filter and do not (un)serialize

Cyperghost · Cyperghost · commit 4aaa262aaf8c · 2025-05-27T10:37:52.000+02:00
diff --git a/wcfsetup/install/files/lib/system/condition/provider/AbstractConditionProvider.class.php b/wcfsetup/install/files/lib/system/condition/provider/AbstractConditionProvider.class.php
@@ -47,7 +47,7 @@ final public function getFieldId(string $containerId, string $identifier, int $i
         return "{$containerId}_{$identifier}_{$index}";
     }
 
-    final public function getConditionFormField(string $containerId, string $identifier, int $index, null|float|int|string $value = null): ConditionRowFormFieldContainer
+    final public function getConditionFormField(string $containerId, string $identifier, int $index, mixed $value = null): ConditionRowFormFieldContainer
     {
         $condition = $this->getConditionByIdentifier($identifier);
         if ($condition === null) {
diff --git a/wcfsetup/install/files/lib/system/condition/type/AbstractConditionType.class.php b/wcfsetup/install/files/lib/system/condition/type/AbstractConditionType.class.php
@@ -8,16 +8,17 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.2
  *
- * @template TFilter of float|int|string
+ * @template TFilter
+ * @implements IConditionType<TFilter>
  */
 abstract class AbstractConditionType implements IConditionType
 {
-    protected float|int|string $filter;
+    protected mixed $filter;
 
     /**
      * @inheritDoc
      */
-    public function setFilter(float|int|string $filter): void
+    public function setFilter(mixed $filter): void
     {
         $this->filter = $filter;
     }
diff --git a/wcfsetup/install/files/lib/system/condition/type/IConditionType.class.php b/wcfsetup/install/files/lib/system/condition/type/IConditionType.class.php
@@ -9,6 +9,8 @@
  * @copyright 2001-2025 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
+ *
+ * @template TFilter
  */
 interface IConditionType
 {
@@ -29,6 +31,8 @@ public function getLabel(): string;
 
     /**
      * Set the filter value for this condition type.
+     *
+     * @param TFilter $filter
      */
-    public function setFilter(float|int|string $filter): void;
+    public function setFilter(mixed $filter): void;
 }
diff --git a/wcfsetup/install/files/lib/system/condition/type/IDatabaseObjectListConditionType.class.php b/wcfsetup/install/files/lib/system/condition/type/IDatabaseObjectListConditionType.class.php
@@ -11,6 +11,8 @@
  * @since 6.3
  *
  * @template T of DatabaseObjectList
+ * @template TFilter
+ * @extends  IConditionType<TFilter>
  */
 interface IDatabaseObjectListConditionType extends IConditionType
 {
diff --git a/wcfsetup/install/files/lib/system/condition/type/IObjectConditionType.class.php b/wcfsetup/install/files/lib/system/condition/type/IObjectConditionType.class.php
@@ -9,6 +9,8 @@
  * @since 6.3
  *
  * @template T of object
+ * @template TFilter
+ * @extends  IConditionType<TFilter>
  */
 interface IObjectConditionType extends IConditionType
 {
diff --git a/wcfsetup/install/files/lib/system/condition/type/user/UserInGroupConditionType.class.php b/wcfsetup/install/files/lib/system/condition/type/user/UserInGroupConditionType.class.php
@@ -17,8 +17,8 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IDatabaseObjectListConditionType<UserList<User>>
- * @implements IObjectConditionType<User>
+ * @implements IDatabaseObjectListConditionType<UserList<User>, int>
+ * @implements IObjectConditionType<User, int>
  * @extends AbstractConditionType<int>
  */
 final class UserInGroupConditionType extends AbstractConditionType implements IDatabaseObjectListConditionType, IObjectConditionType
diff --git a/wcfsetup/install/files/lib/system/condition/type/user/UserNotInGroupConditionType.class.php b/wcfsetup/install/files/lib/system/condition/type/user/UserNotInGroupConditionType.class.php
@@ -17,8 +17,8 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IDatabaseObjectListConditionType<UserList<User>>
- * @implements IObjectConditionType<User>
+ * @implements IDatabaseObjectListConditionType<UserList<User>, int>
+ * @implements IObjectConditionType<User, int>
  * @extends AbstractConditionType<int>
  */
 final class UserNotInGroupConditionType extends AbstractConditionType implements IDatabaseObjectListConditionType, IObjectConditionType
diff --git a/wcfsetup/install/files/lib/system/condition/type/user/UserRegistrationDateConditionType.class.php b/wcfsetup/install/files/lib/system/condition/type/user/UserRegistrationDateConditionType.class.php
@@ -17,9 +17,10 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IDatabaseObjectListConditionType<UserList<User>>
- * @implements IObjectConditionType<User>
- * @extends AbstractConditionType<string>
+ * @phpstan-type Filter = array{condition: string, value: string}
+ * @implements IDatabaseObjectListConditionType<UserList<User>, Filter>
+ * @implements IObjectConditionType<User, Filter>
+ * @extends AbstractConditionType<Filter>
  */
 final class UserRegistrationDateConditionType extends AbstractConditionType implements IDatabaseObjectListConditionType, IObjectConditionType
 {
@@ -74,15 +75,14 @@ public function match(object $object): bool
      */
     private function getParsedFilter(): array
     {
-        ["condition" => $condition, "value" => $filter] = @\unserialize($this->filter);
         $dateTime = \DateTime::createFromFormat(
             DateConditionFormField::TIME_FORMAT,
-            $filter,
+            $this->filter["value"],
             new \DateTimeZone(TIMEZONE),
         );
 
         return [
-            'condition' => $condition,
+            'condition' => $this->filter["condition"],
             'time' => $dateTime->getTimestamp(),
         ];
     }
diff --git a/wcfsetup/install/files/lib/system/condition/type/user/UserRegistrationDaysConditionType.class.php b/wcfsetup/install/files/lib/system/condition/type/user/UserRegistrationDaysConditionType.class.php
@@ -9,16 +9,18 @@
 use wcf\system\condition\type\IDatabaseObjectListConditionType;
 use wcf\system\condition\type\IObjectConditionType;
 use wcf\system\form\builder\field\IntegerConditionFormField;
+use wcf\util\DateUtil;
 
 /**
  * @author Olaf Braun
  * @copyright 2001-2025 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IDatabaseObjectListConditionType<UserList<User>>
- * @implements IObjectConditionType<User>
- * @extends AbstractConditionType<string>
+ * @phpstan-type Filter = array{condition: string, value: int}
+ * @implements IDatabaseObjectListConditionType<UserList<User>, Filter>
+ * @implements IObjectConditionType<User, Filter>
+ * @extends AbstractConditionType<Filter>
  */
 final class UserRegistrationDaysConditionType extends AbstractConditionType implements IDatabaseObjectListConditionType, IObjectConditionType
 {
@@ -45,24 +47,24 @@ public function getLabel(): string
     #[\Override]
     public function applyFilter(DatabaseObjectList $objectList): void
     {
-        ["condition" => $condition, "value" => $days] = @\unserialize($this->filter);
+        ["condition" => $condition, "timestamp" => $timestamp] = $this->getParsedFilter();
 
         $objectList->getConditionBuilder()->add(
             "{$objectList->getDatabaseTableAlias()}.registrationDate {$condition} ?",
-            [TIME_NOW - $days * 86_400]
+            [$timestamp]
         );
     }
 
     #[\Override]
     public function match(object $object): bool
     {
-        ["condition" => $condition, "value" => $days] = @\unserialize($this->filter);
+        ["condition" => $condition, "timestamp" => $timestamp] = $this->getParsedFilter();
 
         return match ($condition) {
-            '>' => $object->registrationDate < TIME_NOW - $days * 86_400,
-            '<' => $object->registrationDate > TIME_NOW - $days * 86_400,
-            '>=' => $object->registrationDate <= TIME_NOW - $days * 86_400,
-            '<=' => $object->registrationDate >= TIME_NOW - $days * 86_400,
+            '>' => $object->registrationDate < $timestamp,
+            '<' => $object->registrationDate > $timestamp,
+            '>=' => $object->registrationDate <= $timestamp,
+            '<=' => $object->registrationDate >= $timestamp,
             default => throw new \InvalidArgumentException("Unknown condition: {$condition}"),
         };
     }
@@ -72,14 +74,17 @@ public function match(object $object): bool
      */
     private function getParsedFilter(): array
     {
-        $filter = @\unserialize($this->filter);
-        if (!\is_array($filter) || !isset($filter['condition'], $filter['value'])) {
+        if (!isset($this->filter['condition'], $this->filter['value'])) {
             throw new \InvalidArgumentException("Invalid filter format");
         }
 
+        $date = DateUtil::getDateTimeByTimestamp(TIME_NOW);
+        $date->setTimezone(new \DateTimeZone(TIMEZONE));
+        $date->sub(new \DateInterval("P{$this->filter['condition']}D"));
+
         return [
-            'condition' => $filter['condition'],
-            'timestamp' => TIME_NOW - ($filter['value'] * 86_400),
+            'condition' => $this->filter['condition'],
+            'timestamp' => $date->getTimestamp(),
         ];
     }
 
diff --git a/wcfsetup/install/files/lib/system/condition/type/user/UserUsernameConditionType.class.php b/wcfsetup/install/files/lib/system/condition/type/user/UserUsernameConditionType.class.php
@@ -16,9 +16,10 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IDatabaseObjectListConditionType<UserList<User>>
- * @implements IObjectConditionType<User>
- * @extends AbstractConditionType<string>
+ * @phpstan-type Filter = array{condition: string, value: string}
+ * @implements IDatabaseObjectListConditionType<UserList<User>, Filter>
+ * @implements IObjectConditionType<User, Filter>
+ * @extends AbstractConditionType<Filter>
  */
 final class UserUsernameConditionType extends AbstractConditionType implements IDatabaseObjectListConditionType, IObjectConditionType
 {
@@ -44,7 +45,7 @@ public function getLabel(): string
     #[\Override]
     public function applyFilter(DatabaseObjectList $objectList): void
     {
-        ["condition" => $condition, "value" => $value] = @\unserialize($this->filter);
+        ["condition" => $condition, "value" => $value] = $this->filter;
         $filter = match ($condition) {
             "%_" => $value . '%',
             "%_%" => '%' . $value . '%',
@@ -61,7 +62,7 @@ public function applyFilter(DatabaseObjectList $objectList): void
     #[\Override]
     public function match(object $object): bool
     {
-        ["condition" => $condition, "value" => $value] = @\unserialize($this->filter);
+        ["condition" => $condition, "value" => $value] = $this->filter;
 
         return match ($condition) {
             "%_" => \str_starts_with($object->username, $value),
diff --git a/wcfsetup/install/files/lib/system/form/builder/container/ConditionFormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/ConditionFormContainer.class.php
@@ -16,7 +16,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @phpstan-type ConditionProvider AbstractConditionProvider<IConditionType>
+ * @phpstan-type ConditionProvider AbstractConditionProvider<IConditionType<mixed>>
  */
 final class ConditionFormContainer extends FormContainer
 {
@@ -85,7 +85,7 @@ public function updatedObject(array $data, IStorableObject $object, $loadValues
         return $this;
     }
 
-    private function appendCondition(string $identifier, int $index, null|float|int|string $value = null): void
+    private function appendCondition(string $identifier, int $index, mixed $value = null): void
     {
         $prefixId = $this->getPrefixedId();
 
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/AbstractConditionFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/AbstractConditionFormField.class.php
@@ -29,10 +29,10 @@ public function getSaveValue()
         }
 
         if (!\is_array($this->value)) {
-            return \serialize([]);
+            return [];
         }
 
-        return \serialize($this->value);
+        return $this->value;
     }
 
     #[\Override]
@@ -61,7 +61,6 @@ public function validate()
     #[\Override]
     public function value($value)
     {
-        $value = @\unserialize($value);
         if (!\is_array($value)) {
             $value = null;
         } elseif (!\array_key_exists('condition', $value) || !\array_key_exists('value', $value)) {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ final public function getFieldId(string $containerId, string $identifier, int $i`
`47`	`47`	`return "{$containerId}_{$identifier}_{$index}";`
`48`	`48`	`}`
`49`	`49`
`50`		`- final public function getConditionFormField(string $containerId, string $identifier, int $index, null\|float\|int\|string $value = null): ConditionRowFormFieldContainer`
	`50`	`+ final public function getConditionFormField(string $containerId, string $identifier, int $index, mixed $value = null): ConditionRowFormFieldContainer`
`51`	`51`	`{`
`52`	`52`	`$condition = $this->getConditionByIdentifier($identifier);`
`53`	`53`	`if ($condition === null) {`
Original file line number	Diff line number	Diff line change
`@@ -8,16 +8,17 @@`
`8`	`8`	`* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>`
`9`	`9`	`* @since 6.2`
`10`	`10`	`*`
`11`		`- * @template TFilter of float\|int\|string`
	`11`	`+ * @template TFilter`
	`12`	`+ * @implements IConditionType<TFilter>`
`12`	`13`	`*/`
`13`	`14`	`abstract class AbstractConditionType implements IConditionType`
`14`	`15`	`{`
`15`		`- protected float\|int\|string $filter;`
	`16`	`+ protected mixed $filter;`
`16`	`17`
`17`	`18`	`/**`
`18`	`19`	`* @inheritDoc`
`19`	`20`	`*/`
`20`		`- public function setFilter(float\|int\|string $filter): void`
	`21`	`+ public function setFilter(mixed $filter): void`
`21`	`22`	`{`
`22`	`23`	`$this->filter = $filter;`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`* @since 6.3`
`12`	`12`	`*`
`13`	`13`	`* @template T of DatabaseObjectList`
	`14`	`+ * @template TFilter`
	`15`	`+ * @extends IConditionType<TFilter>`
`14`	`16`	`*/`
`15`	`17`	`interface IDatabaseObjectListConditionType extends IConditionType`
`16`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`* @since 6.3`
`10`	`10`	`*`
`11`	`11`	`* @template T of object`
	`12`	`+ * @template TFilter`
	`13`	`+ * @extends IConditionType<TFilter>`
`12`	`14`	`*/`
`13`	`15`	`interface IObjectConditionType extends IConditionType`
`14`	`16`	`{`