Completed
Pull Request — master (#7115)
by Björn
14:02
created
lib/public/IUserSession.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -40,44 +40,44 @@
 block discarded – undo
40 40
  * @since 6.0.0
41 41
  */
42 42
 interface IUserSession {
43
-	/**
44
-	 * Do a user login
45
-	 * @param string $user the username
46
-	 * @param string $password the password
47
-	 * @return bool true if successful
48
-	 * @since 6.0.0
49
-	 */
50
-	public function login($user, $password);
43
+    /**
44
+     * Do a user login
45
+     * @param string $user the username
46
+     * @param string $password the password
47
+     * @return bool true if successful
48
+     * @since 6.0.0
49
+     */
50
+    public function login($user, $password);
51 51
 
52
-	/**
53
-	 * Logs the user out including all the session data
54
-	 * Logout, destroys session
55
-	 * @return void
56
-	 * @since 6.0.0
57
-	 */
58
-	public function logout();
52
+    /**
53
+     * Logs the user out including all the session data
54
+     * Logout, destroys session
55
+     * @return void
56
+     * @since 6.0.0
57
+     */
58
+    public function logout();
59 59
 
60
-	/**
61
-	 * set the currently active user
62
-	 *
63
-	 * @param \OCP\IUser|null $user
64
-	 * @since 8.0.0
65
-	 */
66
-	public function setUser($user);
60
+    /**
61
+     * set the currently active user
62
+     *
63
+     * @param \OCP\IUser|null $user
64
+     * @since 8.0.0
65
+     */
66
+    public function setUser($user);
67 67
 
68
-	/**
69
-	 * get the current active user
70
-	 *
71
-	 * @return \OCP\IUser|null Current user, otherwise null
72
-	 * @since 8.0.0
73
-	 */
74
-	public function getUser();
68
+    /**
69
+     * get the current active user
70
+     *
71
+     * @return \OCP\IUser|null Current user, otherwise null
72
+     * @since 8.0.0
73
+     */
74
+    public function getUser();
75 75
 
76
-	/**
77
-	 * Checks whether the user is logged in
78
-	 *
79
-	 * @return bool if logged in
80
-	 * @since 8.0.0
81
-	 */
82
-	public function isLoggedIn();
76
+    /**
77
+     * Checks whether the user is logged in
78
+     *
79
+     * @return bool if logged in
80
+     * @since 8.0.0
81
+     */
82
+    public function isLoggedIn();
83 83
 }
Please login to merge, or discard this patch.
lib/public/IDateTimeZone.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@
 block discarded – undo
30 30
  * @since 8.0.0
31 31
  */
32 32
 interface IDateTimeZone {
33
-	/**
34
-	 * @param bool|int $timestamp
35
-	 * @return \DateTimeZone
36
-	 * @since 8.0.0 - parameter $timestamp was added in 8.1.0
37
-	 */
38
-	public function getTimeZone($timestamp = false);
33
+    /**
34
+     * @param bool|int $timestamp
35
+     * @return \DateTimeZone
36
+     * @since 8.0.0 - parameter $timestamp was added in 8.1.0
37
+     */
38
+    public function getTimeZone($timestamp = false);
39 39
 }
Please login to merge, or discard this patch.
lib/public/Security/StringUtils.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -31,18 +31,18 @@
 block discarded – undo
31 31
  * @since 8.0.0
32 32
  */
33 33
 class StringUtils {
34
-	/**
35
-	 * Compares whether two strings are equal. To prevent guessing of the string
36
-	 * length this is done by comparing two hashes against each other and afterwards
37
-	 * a comparison of the real string to prevent against the unlikely chance of
38
-	 * collisions.
39
-	 * @param string $expected The expected value
40
-	 * @param string $input The input to compare against
41
-	 * @return bool True if the two strings are equal, otherwise false.
42
-	 * @since 8.0.0
43
-	 * @deprecated 9.0.0 Use hash_equals
44
-	 */
45
-	public static function equals($expected, $input) {
46
-		return hash_equals($expected, $input);
47
-	}
34
+    /**
35
+     * Compares whether two strings are equal. To prevent guessing of the string
36
+     * length this is done by comparing two hashes against each other and afterwards
37
+     * a comparison of the real string to prevent against the unlikely chance of
38
+     * collisions.
39
+     * @param string $expected The expected value
40
+     * @param string $input The input to compare against
41
+     * @return bool True if the two strings are equal, otherwise false.
42
+     * @since 8.0.0
43
+     * @deprecated 9.0.0 Use hash_equals
44
+     */
45
+    public static function equals($expected, $input) {
46
+        return hash_equals($expected, $input);
47
+    }
48 48
 }
Please login to merge, or discard this patch.
lib/public/Security/ICredentialsManager.php 1 patch
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -30,43 +30,43 @@
 block discarded – undo
30 30
  */
31 31
 interface ICredentialsManager {
32 32
 
33
-	/**
34
-	 * Store a set of credentials
35
-	 *
36
-	 * @param string|null $userId Null for system-wide credentials
37
-	 * @param string $identifier
38
-	 * @param mixed $credentials
39
-	 * @since 8.2.0
40
-	 */
41
-	public function store($userId, $identifier, $credentials);
33
+    /**
34
+     * Store a set of credentials
35
+     *
36
+     * @param string|null $userId Null for system-wide credentials
37
+     * @param string $identifier
38
+     * @param mixed $credentials
39
+     * @since 8.2.0
40
+     */
41
+    public function store($userId, $identifier, $credentials);
42 42
 
43
-	/**
44
-	 * Retrieve a set of credentials
45
-	 *
46
-	 * @param string|null $userId Null for system-wide credentials
47
-	 * @param string $identifier
48
-	 * @return mixed
49
-	 * @since 8.2.0
50
-	 */
51
-	public function retrieve($userId, $identifier);
43
+    /**
44
+     * Retrieve a set of credentials
45
+     *
46
+     * @param string|null $userId Null for system-wide credentials
47
+     * @param string $identifier
48
+     * @return mixed
49
+     * @since 8.2.0
50
+     */
51
+    public function retrieve($userId, $identifier);
52 52
 
53
-	/**
54
-	 * Delete a set of credentials
55
-	 *
56
-	 * @param string|null $userId Null for system-wide credentials
57
-	 * @param string $identifier
58
-	 * @return int rows removed
59
-	 * @since 8.2.0
60
-	 */
61
-	public function delete($userId, $identifier);
53
+    /**
54
+     * Delete a set of credentials
55
+     *
56
+     * @param string|null $userId Null for system-wide credentials
57
+     * @param string $identifier
58
+     * @return int rows removed
59
+     * @since 8.2.0
60
+     */
61
+    public function delete($userId, $identifier);
62 62
 
63
-	/**
64
-	 * Erase all credentials stored for a user
65
-	 *
66
-	 * @param string $userId
67
-	 * @return int rows removed
68
-	 * @since 8.2.0
69
-	 */
70
-	public function erase($userId);
63
+    /**
64
+     * Erase all credentials stored for a user
65
+     *
66
+     * @param string $userId
67
+     * @return int rows removed
68
+     * @since 8.2.0
69
+     */
70
+    public function erase($userId);
71 71
 
72 72
 }
Please login to merge, or discard this patch.
lib/public/Security/IHasher.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -44,23 +44,23 @@
 block discarded – undo
44 44
  * @since 8.0.0
45 45
  */
46 46
 interface IHasher {
47
-	/**
48
-	 * Hashes a message using PHP's `password_hash` functionality.
49
-	 * Please note that the size of the returned string is not guaranteed
50
-	 * and can be up to 255 characters.
51
-	 *
52
-	 * @param string $message Message to generate hash from
53
-	 * @return string Hash of the message with appended version parameter
54
-	 * @since 8.0.0
55
-	 */
56
-	public function hash($message);
47
+    /**
48
+     * Hashes a message using PHP's `password_hash` functionality.
49
+     * Please note that the size of the returned string is not guaranteed
50
+     * and can be up to 255 characters.
51
+     *
52
+     * @param string $message Message to generate hash from
53
+     * @return string Hash of the message with appended version parameter
54
+     * @since 8.0.0
55
+     */
56
+    public function hash($message);
57 57
 
58
-	/**
59
-	 * @param string $message Message to verify
60
-	 * @param string $hash Assumed hash of the message
61
-	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
62
-	 * @return bool Whether $hash is a valid hash of $message
63
-	 * @since 8.0.0
64
-	 */
65
-	public function verify($message, $hash, &$newHash = null);
58
+    /**
59
+     * @param string $message Message to verify
60
+     * @param string $hash Assumed hash of the message
61
+     * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
62
+     * @return bool Whether $hash is a valid hash of $message
63
+     * @since 8.0.0
64
+     */
65
+    public function verify($message, $hash, &$newHash = null);
66 66
 }
Please login to merge, or discard this patch.
lib/public/Security/IContentSecurityPolicyManager.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -30,22 +30,22 @@
 block discarded – undo
30 30
  * @since 9.0.0
31 31
  */
32 32
 interface IContentSecurityPolicyManager {
33
-	/**
34
-	 * Allows to inject something into the default content policy. This is for
35
-	 * example useful when you're injecting Javascript code into a view belonging
36
-	 * to another controller and cannot modify its Content-Security-Policy itself.
37
-	 * Note that the adjustment is only applied to applications that use AppFramework
38
-	 * controllers.
39
-	 *
40
-	 * To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`,
41
-	 * $policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`.
42
-	 *
43
-	 * WARNING: Using this API incorrectly may make the instance more insecure.
44
-	 * Do think twice before adding whitelisting resources. Please do also note
45
-	 * that it is not possible to use the `disallowXYZ` functions.
46
-	 *
47
-	 * @param EmptyContentSecurityPolicy $policy
48
-	 * @since 9.0.0
49
-	 */
50
-	public function addDefaultPolicy(EmptyContentSecurityPolicy $policy);
33
+    /**
34
+     * Allows to inject something into the default content policy. This is for
35
+     * example useful when you're injecting Javascript code into a view belonging
36
+     * to another controller and cannot modify its Content-Security-Policy itself.
37
+     * Note that the adjustment is only applied to applications that use AppFramework
38
+     * controllers.
39
+     *
40
+     * To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`,
41
+     * $policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`.
42
+     *
43
+     * WARNING: Using this API incorrectly may make the instance more insecure.
44
+     * Do think twice before adding whitelisting resources. Please do also note
45
+     * that it is not possible to use the `disallowXYZ` functions.
46
+     *
47
+     * @param EmptyContentSecurityPolicy $policy
48
+     * @since 9.0.0
49
+     */
50
+    public function addDefaultPolicy(EmptyContentSecurityPolicy $policy);
51 51
 }
Please login to merge, or discard this patch.
lib/public/Security/ICrypto.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -36,30 +36,30 @@
 block discarded – undo
36 36
  */
37 37
 interface ICrypto {
38 38
 
39
-	/**
40
-	 * @param string $message The message to authenticate
41
-	 * @param string $password Password to use (defaults to `secret` in config.php)
42
-	 * @return string Calculated HMAC
43
-	 * @since 8.0.0
44
-	 */
45
-	public function calculateHMAC($message, $password = '');
39
+    /**
40
+     * @param string $message The message to authenticate
41
+     * @param string $password Password to use (defaults to `secret` in config.php)
42
+     * @return string Calculated HMAC
43
+     * @since 8.0.0
44
+     */
45
+    public function calculateHMAC($message, $password = '');
46 46
 
47
-	/**
48
-	 * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
49
-	 * @param string $plaintext
50
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
51
-	 * @return string Authenticated ciphertext
52
-	 * @since 8.0.0
53
-	 */
54
-	public function encrypt($plaintext, $password = '');
47
+    /**
48
+     * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
49
+     * @param string $plaintext
50
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
51
+     * @return string Authenticated ciphertext
52
+     * @since 8.0.0
53
+     */
54
+    public function encrypt($plaintext, $password = '');
55 55
 
56
-	/**
57
-	 * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
58
-	 * @param string $authenticatedCiphertext
59
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
60
-	 * @return string plaintext
61
-	 * @throws \Exception If the HMAC does not match
62
-	 * @since 8.0.0
63
-	 */
64
-	public function decrypt($authenticatedCiphertext, $password = '');
56
+    /**
57
+     * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
58
+     * @param string $authenticatedCiphertext
59
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
60
+     * @return string plaintext
61
+     * @throws \Exception If the HMAC does not match
62
+     * @since 8.0.0
63
+     */
64
+    public function decrypt($authenticatedCiphertext, $password = '');
65 65
 }
Please login to merge, or discard this patch.
lib/public/Federation/ICloudId.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -26,35 +26,35 @@
 block discarded – undo
26 26
  * @since 12.0.0
27 27
  */
28 28
 interface ICloudId {
29
-	/**
30
-	 * The remote cloud id
31
-	 *
32
-	 * @return string
33
-	 * @since 12.0.0
34
-	 */
35
-	public function getId();
29
+    /**
30
+     * The remote cloud id
31
+     *
32
+     * @return string
33
+     * @since 12.0.0
34
+     */
35
+    public function getId();
36 36
 
37
-	/**
38
-	 * Get a clean representation of the cloud id for display
39
-	 *
40
-	 * @return string
41
-	 * @since 12.0.0
42
-	 */
43
-	public function getDisplayId();
37
+    /**
38
+     * Get a clean representation of the cloud id for display
39
+     *
40
+     * @return string
41
+     * @since 12.0.0
42
+     */
43
+    public function getDisplayId();
44 44
 
45
-	/**
46
-	 * The username on the remote server
47
-	 *
48
-	 * @return string
49
-	 * @since 12.0.0
50
-	 */
51
-	public function getUser();
45
+    /**
46
+     * The username on the remote server
47
+     *
48
+     * @return string
49
+     * @since 12.0.0
50
+     */
51
+    public function getUser();
52 52
 
53
-	/**
54
-	 * The base address of the remote server
55
-	 *
56
-	 * @return string
57
-	 * @since 12.0.0
58
-	 */
59
-	public function getRemote();
53
+    /**
54
+     * The base address of the remote server
55
+     *
56
+     * @return string
57
+     * @since 12.0.0
58
+     */
59
+    public function getRemote();
60 60
 }
Please login to merge, or discard this patch.
lib/public/IUserManager.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 	 * remove all user backends
69 69
 	 * @since 8.0.0
70 70
 	 */
71
-	public function clearBackends() ;
71
+	public function clearBackends();
72 72
 
73 73
 	/**
74 74
 	 * get a user by user id
Please login to merge, or discard this patch.
Indentation   +141 added lines, -141 removed lines patch added patch discarded remove patch
@@ -41,145 +41,145 @@
 block discarded – undo
41 41
  * @since 8.0.0
42 42
  */
43 43
 interface IUserManager {
44
-		/**
45
-	 * register a user backend
46
-	 *
47
-	 * @param \OCP\UserInterface $backend
48
-	 * @since 8.0.0
49
-	 */
50
-	public function registerBackend($backend);
51
-
52
-	/**
53
-	 * Get the active backends
54
-	 * @return \OCP\UserInterface[]
55
-	 * @since 8.0.0
56
-	 */
57
-	public function getBackends();
58
-
59
-	/**
60
-	 * remove a user backend
61
-	 *
62
-	 * @param \OCP\UserInterface $backend
63
-	 * @since 8.0.0
64
-	 */
65
-	public function removeBackend($backend);
66
-
67
-	/**
68
-	 * remove all user backends
69
-	 * @since 8.0.0
70
-	 */
71
-	public function clearBackends() ;
72
-
73
-	/**
74
-	 * get a user by user id
75
-	 *
76
-	 * @param string $uid
77
-	 * @return \OCP\IUser|null Either the user or null if the specified user does not exist
78
-	 * @since 8.0.0
79
-	 */
80
-	public function get($uid);
81
-
82
-	/**
83
-	 * check if a user exists
84
-	 *
85
-	 * @param string $uid
86
-	 * @return bool
87
-	 * @since 8.0.0
88
-	 */
89
-	public function userExists($uid);
90
-
91
-	/**
92
-	 * Check if the password is valid for the user
93
-	 *
94
-	 * @param string $loginName
95
-	 * @param string $password
96
-	 * @return mixed the User object on success, false otherwise
97
-	 * @since 8.0.0
98
-	 */
99
-	public function checkPassword($loginName, $password);
100
-
101
-	/**
102
-	 * search by user id
103
-	 *
104
-	 * @param string $pattern
105
-	 * @param int $limit
106
-	 * @param int $offset
107
-	 * @return \OCP\IUser[]
108
-	 * @since 8.0.0
109
-	 */
110
-	public function search($pattern, $limit = null, $offset = null);
111
-
112
-	/**
113
-	 * search by displayName
114
-	 *
115
-	 * @param string $pattern
116
-	 * @param int $limit
117
-	 * @param int $offset
118
-	 * @return \OCP\IUser[]
119
-	 * @since 8.0.0
120
-	 */
121
-	public function searchDisplayName($pattern, $limit = null, $offset = null);
122
-
123
-	/**
124
-	 * @param string $uid
125
-	 * @param string $password
126
-	 * @throws \InvalidArgumentException
127
-	 * @return bool|\OCP\IUser the created user of false
128
-	 * @since 8.0.0
129
-	 */
130
-	public function createUser($uid, $password);
131
-
132
-	/**
133
-	 * @param string $uid
134
-	 * @param string $password
135
-	 * @param UserInterface $backend
136
-	 * @return IUser|null
137
-	 * @throws \InvalidArgumentException
138
-	 * @since 12.0.0
139
-	 */
140
-	public function createUserFromBackend($uid, $password, UserInterface $backend);
141
-
142
-	/**
143
-	 * returns how many users per backend exist (if supported by backend)
144
-	 *
145
-	 * @return array an array of backend class as key and count number as value
146
-	 * @since 8.0.0
147
-	 */
148
-	public function countUsers();
149
-
150
-	/**
151
-	 * @param \Closure $callback
152
-	 * @param string $search
153
-	 * @since 9.0.0
154
-	 */
155
-	public function callForAllUsers(\Closure $callback, $search = '');
156
-
157
-	/**
158
-	 * returns how many users have logged in once
159
-	 *
160
-	 * @return int
161
-	 * @since 11.0.0
162
-	 */
163
-	public function countDisabledUsers();
164
-
165
-	/**
166
-	 * returns how many users have logged in once
167
-	 *
168
-	 * @return int
169
-	 * @since 11.0.0
170
-	 */
171
-	public function countSeenUsers();
172
-
173
-	/**
174
-	 * @param \Closure $callback
175
-	 * @since 11.0.0
176
-	 */
177
-	public function callForSeenUsers(\Closure $callback);
178
-
179
-	/**
180
-	 * @param string $email
181
-	 * @return IUser[]
182
-	 * @since 9.1.0
183
-	 */
184
-	public function getByEmail($email);
44
+        /**
45
+         * register a user backend
46
+         *
47
+         * @param \OCP\UserInterface $backend
48
+         * @since 8.0.0
49
+         */
50
+    public function registerBackend($backend);
51
+
52
+    /**
53
+     * Get the active backends
54
+     * @return \OCP\UserInterface[]
55
+     * @since 8.0.0
56
+     */
57
+    public function getBackends();
58
+
59
+    /**
60
+     * remove a user backend
61
+     *
62
+     * @param \OCP\UserInterface $backend
63
+     * @since 8.0.0
64
+     */
65
+    public function removeBackend($backend);
66
+
67
+    /**
68
+     * remove all user backends
69
+     * @since 8.0.0
70
+     */
71
+    public function clearBackends() ;
72
+
73
+    /**
74
+     * get a user by user id
75
+     *
76
+     * @param string $uid
77
+     * @return \OCP\IUser|null Either the user or null if the specified user does not exist
78
+     * @since 8.0.0
79
+     */
80
+    public function get($uid);
81
+
82
+    /**
83
+     * check if a user exists
84
+     *
85
+     * @param string $uid
86
+     * @return bool
87
+     * @since 8.0.0
88
+     */
89
+    public function userExists($uid);
90
+
91
+    /**
92
+     * Check if the password is valid for the user
93
+     *
94
+     * @param string $loginName
95
+     * @param string $password
96
+     * @return mixed the User object on success, false otherwise
97
+     * @since 8.0.0
98
+     */
99
+    public function checkPassword($loginName, $password);
100
+
101
+    /**
102
+     * search by user id
103
+     *
104
+     * @param string $pattern
105
+     * @param int $limit
106
+     * @param int $offset
107
+     * @return \OCP\IUser[]
108
+     * @since 8.0.0
109
+     */
110
+    public function search($pattern, $limit = null, $offset = null);
111
+
112
+    /**
113
+     * search by displayName
114
+     *
115
+     * @param string $pattern
116
+     * @param int $limit
117
+     * @param int $offset
118
+     * @return \OCP\IUser[]
119
+     * @since 8.0.0
120
+     */
121
+    public function searchDisplayName($pattern, $limit = null, $offset = null);
122
+
123
+    /**
124
+     * @param string $uid
125
+     * @param string $password
126
+     * @throws \InvalidArgumentException
127
+     * @return bool|\OCP\IUser the created user of false
128
+     * @since 8.0.0
129
+     */
130
+    public function createUser($uid, $password);
131
+
132
+    /**
133
+     * @param string $uid
134
+     * @param string $password
135
+     * @param UserInterface $backend
136
+     * @return IUser|null
137
+     * @throws \InvalidArgumentException
138
+     * @since 12.0.0
139
+     */
140
+    public function createUserFromBackend($uid, $password, UserInterface $backend);
141
+
142
+    /**
143
+     * returns how many users per backend exist (if supported by backend)
144
+     *
145
+     * @return array an array of backend class as key and count number as value
146
+     * @since 8.0.0
147
+     */
148
+    public function countUsers();
149
+
150
+    /**
151
+     * @param \Closure $callback
152
+     * @param string $search
153
+     * @since 9.0.0
154
+     */
155
+    public function callForAllUsers(\Closure $callback, $search = '');
156
+
157
+    /**
158
+     * returns how many users have logged in once
159
+     *
160
+     * @return int
161
+     * @since 11.0.0
162
+     */
163
+    public function countDisabledUsers();
164
+
165
+    /**
166
+     * returns how many users have logged in once
167
+     *
168
+     * @return int
169
+     * @since 11.0.0
170
+     */
171
+    public function countSeenUsers();
172
+
173
+    /**
174
+     * @param \Closure $callback
175
+     * @since 11.0.0
176
+     */
177
+    public function callForSeenUsers(\Closure $callback);
178
+
179
+    /**
180
+     * @param string $email
181
+     * @return IUser[]
182
+     * @since 9.1.0
183
+     */
184
+    public function getByEmail($email);
185 185
 }
Please login to merge, or discard this patch.