Completed
Pull Request — master (#4692)
by Björn
28:51 queued 03:35
created
apps/user_ldap/lib/Access.php 1 patch
Doc Comments   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
 
491 491
 	/**
492 492
 	 * returns the internal Nextcloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
493
-	 * @param string $dn the dn of the user object
493
+	 * @param string $fdn the dn of the user object
494 494
 	 * @param string $ldapName optional, the display name of the object
495 495
 	 * @return string|false with with the name to use in Nextcloud
496 496
 	 */
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
 
508 508
 	/**
509 509
 	 * returns an internal Nextcloud name for the given LDAP DN, false on DN outside of search DN
510
-	 * @param string $dn the dn of the user object
510
+	 * @param string $fdn the dn of the user object
511 511
 	 * @param string $ldapName optional, the display name of the object
512 512
 	 * @param bool $isUser optional, whether it is a user object (otherwise group assumed)
513 513
 	 * @return string|false with with the name to use in Nextcloud
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
 	 * the login filter.
771 771
 	 *
772 772
 	 * @param string $loginName
773
-	 * @param array $attributes optional, list of attributes to read
773
+	 * @param string[] $attributes optional, list of attributes to read
774 774
 	 * @return array
775 775
 	 */
776 776
 	public function fetchUsersByLoginName($loginName, $attributes = array('dn')) {
@@ -843,7 +843,7 @@  discard block
 block discarded – undo
843 843
 
844 844
 	/**
845 845
 	 * @param string $filter
846
-	 * @param string|string[] $attr
846
+	 * @param string[] $attr
847 847
 	 * @param int $limit
848 848
 	 * @param int $offset
849 849
 	 * @return array
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
 
892 892
 	/**
893 893
 	 * @param string $filter
894
-	 * @param string|string[] $attr
894
+	 * @param string[] $attr
895 895
 	 * @param int $limit
896 896
 	 * @param int $offset
897 897
 	 * @return false|int
@@ -941,6 +941,7 @@  discard block
 block discarded – undo
941 941
 	 * retrieved. Results will according to the order in the array.
942 942
 	 * @param int $limit optional, maximum results to be counted
943 943
 	 * @param int $offset optional, a starting point
944
+	 * @param string $filter
944 945
 	 * @return array|false array with the search result as first value and pagedSearchOK as
945 946
 	 * second | false if not successful
946 947
 	 */
@@ -1191,7 +1192,7 @@  discard block
 block discarded – undo
1191 1192
 
1192 1193
 	/**
1193 1194
 	 * @param string $name
1194
-	 * @return bool|mixed|string
1195
+	 * @return string
1195 1196
 	 */
1196 1197
 	public function sanitizeUsername($name) {
1197 1198
 		if($this->connection->ldapIgnoreNamingRules) {
@@ -1215,6 +1216,7 @@  discard block
 block discarded – undo
1215 1216
 	* escapes (user provided) parts for LDAP filter
1216 1217
 	* @param string $input, the provided value
1217 1218
 	* @param bool $allowAsterisk whether in * at the beginning should be preserved
1219
+	* @param string $input
1218 1220
 	* @return string the escaped string
1219 1221
 	*/
1220 1222
 	public function escapeFilterPart($input, $allowAsterisk = false) {
Please login to merge, or discard this patch.
lib/private/Mail/EMailTemplate.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -335,7 +335,7 @@
 block discarded – undo
335 335
 	 * Adds a heading to the email
336 336
 	 *
337 337
 	 * @param string $title
338
-	 * @param string $plainTitle|bool Title that is used in the plain text email
338
+	 * @param string $plainTitle Title that is used in the plain text email
339 339
 	 *   if empty the $title is used, if false none will be used
340 340
 	 */
341 341
 	public function addHeading($title, $plainTitle = '') {
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
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	private $parameters = [];
38 38
 
39 39
 	/**
40
-	 * @param object $object an object or classname
40
+	 * @param \OCP\AppFramework\Controller $object an object or classname
41 41
 	 * @param string $method the method which we want to inspect
42 42
 	 */
43 43
 	public function reflect($object, $method){
Please login to merge, or discard this patch.
lib/private/User/User.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -436,6 +436,11 @@
 block discarded – undo
436 436
 		return $url;
437 437
 	}
438 438
 
439
+	/**
440
+	 * @param string $feature
441
+	 * @param string $value
442
+	 * @param string $oldValue
443
+	 */
439 444
 	public function triggerChange($feature, $value = null, $oldValue = null) {
440 445
 		if ($this->emitter) {
441 446
 			$this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value, $oldValue));
Please login to merge, or discard this patch.
lib/private/User/Session.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 	 * @param IUser $user
330 330
 	 * @param array $loginDetails
331 331
 	 * @param bool $regenerateSessionId
332
-	 * @return true returns true if login successful or an exception otherwise
332
+	 * @return boolean returns true if login successful or an exception otherwise
333 333
 	 * @throws LoginException
334 334
 	 */
335 335
 	public function completeLogin(IUser $user, array $loginDetails, $regenerateSessionId = true) {
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 	 * @param OC\Security\Bruteforce\Throttler $throttler
378 378
 	 * @throws LoginException
379 379
 	 * @throws PasswordLoginForbiddenException
380
-	 * @return boolean
380
+	 * @return boolean|null
381 381
 	 */
382 382
 	public function logClientIn($user,
383 383
 								$password,
@@ -431,6 +431,9 @@  discard block
 block discarded – undo
431 431
 		return $this->config->getSystemValue('token_auth_enforced', false);
432 432
 	}
433 433
 
434
+	/**
435
+	 * @param string $username
436
+	 */
434 437
 	protected function isTwoFactorEnforced($username) {
435 438
 		Util::emitHook(
436 439
 			'\OCA\Files_Sharing\API\Server2Server',
Please login to merge, or discard this patch.
lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
 	 * @param bool $isLoggedIn
100 100
 	 * @param bool $isAdminUser
101 101
 	 * @param ContentSecurityPolicyManager $contentSecurityPolicyManager
102
-	 * @param CSRFTokenManager $csrfTokenManager
102
+	 * @param CsrfTokenManager $csrfTokenManager
103 103
 	 * @param ContentSecurityPolicyNonceManager $cspNonceManager
104 104
 	 */
105 105
 	public function __construct(IRequest $request,
Please login to merge, or discard this patch.
apps/sharebymail/lib/ShareByMailProvider.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -276,10 +276,10 @@  discard block
 block discarded – undo
276 276
 	 * publish activity if a file/folder was shared by mail
277 277
 	 *
278 278
 	 * @param $subject
279
-	 * @param $parameters
280
-	 * @param $affectedUser
279
+	 * @param string[] $parameters
280
+	 * @param string $affectedUser
281 281
 	 * @param $fileId
282
-	 * @param $filePath
282
+	 * @param string $filePath
283 283
 	 */
284 284
 	protected function publishActivity($subject, $parameters, $affectedUser, $fileId, $filePath) {
285 285
 		$event = $this->activityManager->generateEvent();
@@ -557,6 +557,7 @@  discard block
 block discarded – undo
557 557
 	 * @param string $uidOwner
558 558
 	 * @param int $permissions
559 559
 	 * @param string $token
560
+	 * @param string $password
560 561
 	 * @return int
561 562
 	 */
562 563
 	protected function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $password) {
@@ -950,7 +951,7 @@  discard block
 block discarded – undo
950 951
 	/**
951 952
 	 * get database row of a give share
952 953
 	 *
953
-	 * @param $id
954
+	 * @param integer $id
954 955
 	 * @return array
955 956
 	 * @throws ShareNotFound
956 957
 	 */
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/ShareesAPIController.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 	 * split user and remote from federated cloud id
386 386
 	 *
387 387
 	 * @param string $address federated share address
388
-	 * @return array [user, remoteURL]
388
+	 * @return string[] [user, remoteURL]
389 389
 	 * @throws \Exception
390 390
 	 */
391 391
 	public function splitUserRemote($address) {
@@ -652,6 +652,9 @@  discard block
 block discarded – undo
652 652
 		return $result;
653 653
 	}
654 654
 
655
+	/**
656
+	 * @param string $search
657
+	 */
655 658
 	protected function getLookup($search) {
656 659
 		$isEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
657 660
 		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/CardDavBackend.php 1 patch
Doc Comments   +11 added lines, -3 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	/**
105 105
 	 * Return the number of address books for a principal
106 106
 	 *
107
-	 * @param $principalUri
107
+	 * @param string $principalUri
108 108
 	 * @return int
109 109
 	 */
110 110
 	public function getAddressBooksForUserCount($principalUri) {
@@ -212,6 +212,9 @@  discard block
 block discarded – undo
212 212
 		return array_values($addressBooks);
213 213
 	}
214 214
 
215
+	/**
216
+	 * @param string $principalUri
217
+	 */
215 218
 	public function getUsersOwnAddressBooks($principalUri) {
216 219
 		$principalUri = $this->convertPrincipal($principalUri, true);
217 220
 		$query = $this->db->getQueryBuilder();
@@ -280,7 +283,8 @@  discard block
 block discarded – undo
280 283
 	}
281 284
 
282 285
 	/**
283
-	 * @param $addressBookUri
286
+	 * @param string $addressBookUri
287
+	 * @param string $principal
284 288
 	 * @return array|null
285 289
 	 */
286 290
 	public function getAddressBooksByUri($principal, $addressBookUri) {
@@ -969,6 +973,7 @@  discard block
 block discarded – undo
969 973
 	 *   * readOnly - boolean
970 974
 	 *   * summary - Optional, a description for the share
971 975
 	 *
976
+	 * @param integer $addressBookId
972 977
 	 * @return array
973 978
 	 */
974 979
 	public function getShares($addressBookId) {
@@ -1068,7 +1073,7 @@  discard block
 block discarded – undo
1068 1073
 
1069 1074
 	/**
1070 1075
 	 * For shared address books the sharee is set in the ACL of the address book
1071
-	 * @param $addressBookId
1076
+	 * @param integer $addressBookId
1072 1077
 	 * @param $acl
1073 1078
 	 * @return array
1074 1079
 	 */
@@ -1076,6 +1081,9 @@  discard block
 block discarded – undo
1076 1081
 		return $this->sharingBackend->applyShareAcl($addressBookId, $acl);
1077 1082
 	}
1078 1083
 
1084
+	/**
1085
+	 * @param boolean $toV2
1086
+	 */
1079 1087
 	private function convertPrincipal($principalUri, $toV2) {
1080 1088
 		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
1081 1089
 			list(, $name) = URLUtil::splitPath($principalUri);
Please login to merge, or discard this patch.