Completed
Pull Request — master (#31078)
by Matthew
19:10 queued 06:47
created
lib/private/Share/MailNotifications.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -180,10 +180,10 @@
 block discarded – undo
180 180
 	 * inform recipient about public link share
181 181
 	 *
182 182
 	 * @param string $recipient recipient email address
183
-	 * @param string $filename the shared file
184
-	 * @param string $link the public link
185 183
 	 * @param array $options allows ['cc'] and ['bcc'] recipients
186
-	 * @param int $expiration expiration date (timestamp)
184
+	 * @param string $subject
185
+	 * @param boolean|string $htmlBody
186
+	 * @param boolean|string $textBody
187 187
 	 * @return string[] $result of failed recipients
188 188
 	 */
189 189
 	public function sendLinkShareMailFromBody($recipient, $subject, $htmlBody, $textBody, $options = array()) {
Please login to merge, or discard this patch.
apps/dav/lib/Upload/ChunkingPlugin.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	/**
46 46
 	 * @param string $sourcePath source path
47 47
 	 * @param string $destination destination path
48
-	 * @return bool|void
48
+	 * @return null|false
49 49
 	 * @throws BadRequest
50 50
 	 * @throws \Sabre\DAV\Exception\NotFound
51 51
 	 */
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 *
70 70
 	 * @param string $path source path
71 71
 	 * @param string $destination destination path
72
-	 * @return bool|void false to stop handling, void to skip this handler
72
+	 * @return null|false false to stop handling, void to skip this handler
73 73
 	 */
74 74
 	public function performMove($path, $destination) {
75 75
 		if (!$this->server->tree->nodeExists($destination)) {
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/CalDavBackend.php 1 patch
Doc Comments   +7 added lines, -1 removed lines patch added patch discarded remove patch
@@ -270,6 +270,9 @@  discard block
 block discarded – undo
270 270
 		return array_values($calendars);
271 271
 	}
272 272
 
273
+	/**
274
+	 * @param string $principalUri
275
+	 */
273 276
 	public function getUsersOwnCalendars($principalUri) {
274 277
 		$principalUri = $this->convertPrincipal($principalUri, true);
275 278
 		$fields = array_values($this->propertyMap);
@@ -1279,7 +1282,7 @@  discard block
 block discarded – undo
1279 1282
 	 * @param string $principalUri
1280 1283
 	 * @param string $uri
1281 1284
 	 * @param array $properties
1282
-	 * @return mixed
1285
+	 * @return integer
1283 1286
 	 * @throws Forbidden
1284 1287
 	 */
1285 1288
 	function createSubscription($principalUri, $uri, array $properties) {
@@ -1685,6 +1688,9 @@  discard block
 block discarded – undo
1685 1688
 		return $this->sharingBackend->applyShareAcl($resourceId, $acl);
1686 1689
 	}
1687 1690
 
1691
+	/**
1692
+	 * @param boolean $toV2
1693
+	 */
1688 1694
 	private function convertPrincipal($principalUri, $toV2 = null) {
1689 1695
 		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
1690 1696
 			list(, $name) = URLUtil::splitPath($principalUri);
Please login to merge, or discard this patch.
lib/private/User/Session.php 1 patch
Doc Comments   +8 added lines, -2 removed lines patch added patch discarded remove patch
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 	 * @throws \InvalidArgumentException
324 324
 	 * @throws LoginException
325 325
 	 * @throws PasswordLoginForbiddenException
326
-	 * @return boolean
326
+	 * @return boolean|null
327 327
 	 */
328 328
 	public function logClientIn($user, $password, IRequest $request) {
329 329
 		$isTokenPassword = $this->isTokenPassword($password);
@@ -366,6 +366,9 @@  discard block
 block discarded – undo
366 366
 		return $this->config->getSystemValue('token_auth_enforced', false);
367 367
 	}
368 368
 
369
+	/**
370
+	 * @param string $username
371
+	 */
369 372
 	protected function isTwoFactorEnforced($username) {
370 373
 		Util::emitHook(
371 374
 			'\OCA\Files_Sharing\API\Server2Server',
@@ -988,6 +991,9 @@  discard block
 block discarded – undo
988 991
 		}
989 992
 	}
990 993
 
994
+	/**
995
+	 * @param IRequest $request
996
+	 */
991 997
 	public function verifyAuthHeaders($request) {
992 998
 		$shallLogout = false;
993 999
 		try {
@@ -1019,7 +1025,7 @@  discard block
 block discarded – undo
1019 1025
 	}
1020 1026
 
1021 1027
 	/**
1022
-	 * @param $includeBuiltIn
1028
+	 * @param boolean $includeBuiltIn
1023 1029
 	 * @return \Generator | IAuthModule[]
1024 1030
 	 * @throws Exception
1025 1031
 	 */
Please login to merge, or discard this patch.
lib/private/User/TokenAuthModule.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,6 @@
 block discarded – undo
30 30
 use OCP\Authentication\IAuthModule;
31 31
 use OCP\IRequest;
32 32
 use OCP\ISession;
33
-use OCP\IUser;
34 33
 use OCP\IUserManager;
35 34
 use OCP\Session\Exceptions\SessionNotAvailableException;
36 35
 
Please login to merge, or discard this patch.
core/Command/User/SyncBackend.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 	 * @param SyncService $syncService
173 173
 	 * @param UserInterface $backend
174 174
 	 * @param string $missingAccountsAction
175
-	 * @param array $validActions
175
+	 * @param string[] $validActions
176 176
 	 */
177 177
 	private function syncMultipleUsers (
178 178
 		InputInterface $input,
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	 * @param UserInterface $backend
221 221
 	 * @param string $uid
222 222
 	 * @param string $missingAccountsAction
223
-	 * @param array $validActions
223
+	 * @param string[] $validActions
224 224
 	 */
225 225
 	private function syncSingleUser(
226 226
 		InputInterface $input,
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	}
256 256
 
257 257
 	/**
258
-	 * @param array $uids a list of uids to the the action
258
+	 * @param string[] $uids a list of uids to the the action
259 259
 	 * @param callable $callbackExists the callback used if the account for the uid exists. The
260 260
 	 * uid and the specific account will be passed as parameter to the callback in that order
261 261
 	 * @param callable $callbackMissing the callback used if the account doesn't exists. The uid (not
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 	 * @param string[] $unknownUsers
277 277
 	 * @param InputInterface $input
278 278
 	 * @param OutputInterface $output
279
-	 * @param $missingAccountsAction
279
+	 * @param string $missingAccountsAction
280 280
 	 * @param $validActions
281 281
 	 */
282 282
 	private function handleUnknownUsers(array $unknownUsers, InputInterface $input, OutputInterface $output, $missingAccountsAction, $validActions) {
Please login to merge, or discard this patch.
lib/private/Notification/Manager.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -113,6 +113,8 @@
 block discarded – undo
113 113
 	 * INTERNAL USE ONLY!! This method isn't part of the IManager interface
114 114
 	 * @internal This should only be used by the RegisterNotifierEventImpl (the real implementation).
115 115
 	 * Do NOT use this method outside as it might not work as expected.
116
+	 * @param string $id
117
+	 * @param string $name
116 118
 	 */
117 119
 	public function registerBuiltNotifier(INotifier $notifier, $id, $name) {
118 120
 		if (!isset($this->builtNotifiersHolder[$id]) && !isset($this->notifiersInfo[$id])) {
Please login to merge, or discard this patch.
lib/private/AppFramework/Utility/ControllerMethodReflector.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 
47 47
 
48 48
 	/**
49
-	 * @param object|string $object an object or classname
49
+	 * @param \OCP\AppFramework\Controller $object an object or classname
50 50
 	 * @param string $method the method which we want to inspect
51 51
 	 * @throws \ReflectionException
52 52
 	 */
Please login to merge, or discard this patch.
settings/Controller/CorsController.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -134,7 +134,6 @@
 block discarded – undo
134 134
 	 * @NoAdminRequired
135 135
 	 * @NoSubadminRequired
136 136
 	 *
137
-	 * @param string $domain Domain to remove
138 137
 	 * @return RedirectResponse Redirection to the settings page.
139 138
 	 */
140 139
 	public function removeDomain($id) {
Please login to merge, or discard this patch.