Change Filter Type to string when SelectFormField is used

Author: Cyperghost

wcfsetup/install/files/lib/system/condition/type/user/UserHasNotTrophyConditionType.class.php

@@ -20,15 +20,17 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IDatabaseObjectListConditionType<UserList<User>, int>
- * @implements IObjectConditionType<User, int>
- * @extends AbstractConditionType<int>
+ * @implements IDatabaseObjectListConditionType<UserList<User>, string>
+ * @implements IObjectConditionType<User, string>
+ * @extends AbstractConditionType<string>
  */
 final class UserHasNotTrophyConditionType extends AbstractConditionType implements IDatabaseObjectListConditionType, IObjectConditionType
 {
     #[\Override]
     public function getFormField(string $id): SelectFormField
     {
+        // SelectFormField stores its value as a string,
+        // so we need to convert it to an integer in the `applyFilter`&`matches` method.
         return SelectFormField::create($id)
             ->options($this->getTrophies())
             ->required();
@@ -55,7 +57,7 @@ public function applyFilter(DatabaseObjectList $objectList): void
                     FROM   wcf1_user_trophy
                     WHERE  trophyID = ?
             )",
-            [$this->filter]
+            [(int)$this->filter]
         );
     }
 
@@ -65,7 +67,7 @@ public function matches(object $object): bool
         $userTrophies = UserTrophyList::getUserTrophies([$object->userID], false)[$object->userID];
         $trophyIDs = \array_column($userTrophies, 'trophyID');
 
-        return !\in_array($this->filter, $trophyIDs, true);
+        return !\in_array((int)$this->filter, $trophyIDs, true);
     }
 
     /**

wcfsetup/install/files/lib/system/condition/type/user/UserHasTrophyConditionType.class.php

@@ -20,15 +20,17 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IDatabaseObjectListConditionType<UserList<User>, int>
- * @implements IObjectConditionType<User, int>
- * @extends AbstractConditionType<int>
+ * @implements IDatabaseObjectListConditionType<UserList<User>, string>
+ * @implements IObjectConditionType<User, string>
+ * @extends AbstractConditionType<string>
  */
 final class UserHasTrophyConditionType extends AbstractConditionType implements IDatabaseObjectListConditionType, IObjectConditionType
 {
     #[\Override]
     public function getFormField(string $id): SelectFormField
     {
+        // SelectFormField stores its value as a string,
+        // so we need to convert it to an integer in the `applyFilter`&`matches` method.
         return SelectFormField::create($id)
             ->options($this->getTrophies())
             ->required();
@@ -55,7 +57,7 @@ public function applyFilter(DatabaseObjectList $objectList): void
                     FROM   wcf1_user_trophy
                     WHERE  trophyID = ?
             )",
-            [$this->filter]
+            [(int)$this->filter]
         );
     }
 
@@ -65,7 +67,7 @@ public function matches(object $object): bool
         $userTrophies = UserTrophyList::getUserTrophies([$object->userID], false)[$object->userID];
         $trophyIDs = \array_column($userTrophies, 'trophyID');
 
-        return \in_array($this->filter, $trophyIDs, true);
+        return \in_array((int)$this->filter, $trophyIDs, true);
     }
 
     /**

wcfsetup/install/files/lib/system/condition/type/user/UserInGroupConditionType.class.php

@@ -17,15 +17,17 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IDatabaseObjectListConditionType<UserList<User>, int>
- * @implements IObjectConditionType<User, int>
- * @extends AbstractConditionType<int>
+ * @implements IDatabaseObjectListConditionType<UserList<User>, string>
+ * @implements IObjectConditionType<User, string>
+ * @extends AbstractConditionType<string>
  */
 final class UserInGroupConditionType extends AbstractConditionType implements IDatabaseObjectListConditionType, IObjectConditionType
 {
     #[\Override]
     public function getFormField(string $id): SelectFormField
     {
+        // SelectFormField stores its value as a string,
+        // so we need to convert it to an integer in the `applyFilter`&`matches` method.
         return SelectFormField::create($id)
             ->options(
                 UserGroup::getGroupsByType(invalidGroupTypes: [
@@ -58,13 +60,13 @@ public function applyFilter(DatabaseObjectList $objectList): void
                     FROM   wcf1_user_to_group
                     WHERE  groupID = ?
             )",
-            [$this->filter]
+            [(int)$this->filter]
         );
     }
 
     #[\Override]
     public function matches(object $object): bool
     {
-        return \in_array($this->filter, $object->getGroupIDs(), true);
+        return \in_array((int)$this->filter, $object->getGroupIDs(), true);
     }
 }

wcfsetup/install/files/lib/system/condition/type/user/UserLanguageConditionType.class.php

@@ -17,15 +17,17 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IDatabaseObjectListConditionType<UserList<User>, int>
- * @implements IObjectConditionType<User, int>
- * @extends AbstractConditionType<int>
+ * @implements IDatabaseObjectListConditionType<UserList<User>, string>
+ * @implements IObjectConditionType<User, string>
+ * @extends AbstractConditionType<string>
  */
 final class UserLanguageConditionType extends AbstractConditionType implements IDatabaseObjectListConditionType, IObjectConditionType
 {
     #[\Override]
     public function getFormField(string $id): SelectFormField
     {
+        // SelectFormField stores its value as a string,
+        // so we need to convert it to an integer in the `applyFilter`&`matches` method.
         return SelectFormField::create($id)
             ->options(LanguageFactory::getInstance()->getLanguages())
             ->required();
@@ -48,13 +50,13 @@ public function applyFilter(DatabaseObjectList $objectList): void
     {
         $objectList->getConditionBuilder()->add(
             "{$objectList->getDatabaseTableAlias()}.languageID = ?",
-            [$this->filter]
+            [(int)$this->filter]
         );
     }
 
     #[\Override]
     public function matches(object $object): bool
     {
-        return $this->filter === $object->languageID;
+        return (int)$this->filter === $object->languageID;
     }
 }

wcfsetup/install/files/lib/system/condition/type/user/UserNotInGroupConditionType.class.php

@@ -17,15 +17,17 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IDatabaseObjectListConditionType<UserList<User>, int>
- * @implements IObjectConditionType<User, int>
- * @extends AbstractConditionType<int>
+ * @implements IDatabaseObjectListConditionType<UserList<User>, string>
+ * @implements IObjectConditionType<User, string>
+ * @extends AbstractConditionType<string>
  */
 final class UserNotInGroupConditionType extends AbstractConditionType implements IDatabaseObjectListConditionType, IObjectConditionType
 {
     #[\Override]
     public function getFormField(string $id): SelectFormField
     {
+        // SelectFormField stores its value as a string,
+        // so we need to convert it to an integer in the `applyFilter`&`matches` method.
         return SelectFormField::create($id)
             ->options(
                 UserGroup::getGroupsByType(invalidGroupTypes: [
@@ -58,13 +60,13 @@ public function applyFilter(DatabaseObjectList $objectList): void
                     FROM   wcf1_user_to_group
                     WHERE  groupID = ?
             )",
-            [$this->filter]
+            [(int)$this->filter]
         );
     }
 
     #[\Override]
     public function matches(object $object): bool
     {
-        return !\in_array($this->filter, $object->getGroupIDs(), true);
+        return !\in_array((int)$this->filter, $object->getGroupIDs(), true);
     }
 }