diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-06-20 15:10:39 +0200 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-06-20 15:10:39 +0200 |
| commit | 1603cdc8d2798ddc2799a75deaf42b58515f84cd (patch) | |
| tree | 010d8d9371fc2e7a42c83dcbef085909c2839d59 /lib | |
| parent | 367b4fe9f2361e9982dcd6e1e836f0bd3d37ce71 (diff) | |
| download | nextcloud-server-1603cdc8d2798ddc2799a75deaf42b58515f84cd.tar.gz nextcloud-server-1603cdc8d2798ddc2799a75deaf42b58515f84cd.zip | |
Fix since annotations and add boolean return type for setUserEnabled
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/User/User.php | 6 | ||||
| -rw-r--r-- | lib/public/User/Backend/IProvideEnabledStateBackend.php | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/User/User.php b/lib/private/User/User.php index 3b7123bd575..edaab879ef7 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -438,7 +438,7 @@ class User implements IUser { $enabled = $this->config->getUserValue($this->uid, 'core', 'enabled', 'true'); $this->enabled = $enabled === 'true'; } - return (bool) $this->enabled; + return $this->enabled; }; if ($this->backend instanceof IProvideEnabledStateBackend) { return $this->backend->isUserEnabled($this->uid, $queryDatabaseValue); @@ -464,9 +464,9 @@ class User implements IUser { $enabled = $this->config->getUserValue($this->uid, 'core', 'enabled', 'true'); $this->enabled = $enabled === 'true'; } - return (bool) $this->enabled; + return $this->enabled; }; - $this->backend->setUserEnabled($this->uid, $enabled, $queryDatabaseValue, $setDatabaseValue); + $enabled = $this->backend->setUserEnabled($this->uid, $enabled, $queryDatabaseValue, $setDatabaseValue); if ($oldStatus !== $enabled) { $this->triggerChange('enabled', $enabled, $oldStatus); } diff --git a/lib/public/User/Backend/IProvideEnabledStateBackend.php b/lib/public/User/Backend/IProvideEnabledStateBackend.php index 143eca548ab..8a4755ffbef 100644 --- a/lib/public/User/Backend/IProvideEnabledStateBackend.php +++ b/lib/public/User/Backend/IProvideEnabledStateBackend.php @@ -27,21 +27,21 @@ declare(strict_types=1); namespace OCP\User\Backend; /** - * @since 26.0.0 + * @since 28.0.0 */ interface IProvideEnabledStateBackend { /** - * @since 26.0.0 + * @since 28.0.0 * * @param callable():bool $queryDatabaseValue A callable to query the enabled state from database */ public function isUserEnabled(string $uid, callable $queryDatabaseValue): bool; /** - * @since 26.0.0 + * @since 28.0.0 * * @param callable():bool $queryDatabaseValue A callable to query the enabled state from database * @param callable(bool):void $setDatabaseValue A callable to set the enabled state in the database. */ - public function setUserEnabled(string $uid, bool $enabled, callable $queryDatabaseValue, callable $setDatabaseValue): void; + public function setUserEnabled(string $uid, bool $enabled, callable $queryDatabaseValue, callable $setDatabaseValue): bool; } |