diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-11 18:28:45 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-13 19:08:14 +0100 |
| commit | a7ae2e874a28aed2c190840634db50a19ab1d2e7 (patch) | |
| tree | 1e86370be647a8845bf2ac11c0287def1f3802db /lib/private/user | |
| parent | b5bc37d2e40aba0ab8d3e72e7f7075352839096d (diff) | |
| download | nextcloud-server-a7ae2e874a28aed2c190840634db50a19ab1d2e7.tar.gz nextcloud-server-a7ae2e874a28aed2c190840634db50a19ab1d2e7.zip | |
Squash 'a | b' into 'a|b', in /lib
Diffstat (limited to 'lib/private/user')
| -rw-r--r-- | lib/private/user/database.php | 2 | ||||
| -rw-r--r-- | lib/private/user/dummy.php | 2 | ||||
| -rw-r--r-- | lib/private/user/manager.php | 2 | ||||
| -rw-r--r-- | lib/private/user/user.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/user/database.php b/lib/private/user/database.php index d54b0567a18..284b3582598 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -273,7 +273,7 @@ class OC_User_Database extends OC_User_Backend { /** * counts the users in the database * - * @return int | bool + * @return int|bool */ public function countUsers() { $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php index 2fb51d02de3..d2ada37c80f 100644 --- a/lib/private/user/dummy.php +++ b/lib/private/user/dummy.php @@ -127,7 +127,7 @@ class OC_User_Dummy extends OC_User_Backend { /** * counts the users in the database * - * @return int | bool + * @return int|bool */ public function countUsers() { return 0; diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index 939f99618d1..6765491e695 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -222,7 +222,7 @@ class Manager extends PublicEmitter { * @param string $uid * @param string $password * @throws \Exception - * @return bool | \OC\User\User the created user of false + * @return bool|\OC\User\User the created user of false */ public function createUser($uid, $password) { $l = \OC_L10N::get('lib'); diff --git a/lib/private/user/user.php b/lib/private/user/user.php index ef5364cbf7b..abdbef38d9a 100644 --- a/lib/private/user/user.php +++ b/lib/private/user/user.php @@ -33,7 +33,7 @@ class User { private $enabled; /** - * @var Emitter | Manager $emitter + * @var Emitter|Manager $emitter */ private $emitter; |