Completed
Pull Request — master (#1143)
by Lukas
210:36 queued 200:20
created
apps/user_ldap/lib/Access.php 1 patch
Doc Comments   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 
362 362
 	/**
363 363
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
364
-	 * @param string $dn the dn of the user object
364
+	 * @param string $fdn the dn of the user object
365 365
 	 * @param string $ldapName optional, the display name of the object
366 366
 	 * @return string|false with with the name to use in ownCloud
367 367
 	 */
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 
379 379
 	/**
380 380
 	 * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN
381
-	 * @param string $dn the dn of the user object
381
+	 * @param string $fdn the dn of the user object
382 382
 	 * @param string $ldapName optional, the display name of the object
383 383
 	 * @param bool $isUser optional, whether it is a user object (otherwise group assumed)
384 384
 	 * @return string|false with with the name to use in ownCloud
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
 	 * the login filter.
639 639
 	 *
640 640
 	 * @param string $loginName
641
-	 * @param array $attributes optional, list of attributes to read
641
+	 * @param string[] $attributes optional, list of attributes to read
642 642
 	 * @return array
643 643
 	 */
644 644
 	public function fetchUsersByLoginName($loginName, $attributes = array('dn')) {
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
711 711
 
712 712
 	/**
713 713
 	 * @param string $filter
714
-	 * @param string|string[] $attr
714
+	 * @param string[] $attr
715 715
 	 * @param int $limit
716 716
 	 * @param int $offset
717 717
 	 * @return array
@@ -759,7 +759,7 @@  discard block
 block discarded – undo
759 759
 
760 760
 	/**
761 761
 	 * @param string $filter
762
-	 * @param string|string[] $attr
762
+	 * @param string[] $attr
763 763
 	 * @param int $limit
764 764
 	 * @param int $offset
765 765
 	 * @return false|int
@@ -809,6 +809,7 @@  discard block
 block discarded – undo
809 809
 	 * retrieved. Results will according to the order in the array.
810 810
 	 * @param int $limit optional, maximum results to be counted
811 811
 	 * @param int $offset optional, a starting point
812
+	 * @param string $filter
812 813
 	 * @return array|false array with the search result as first value and pagedSearchOK as
813 814
 	 * second | false if not successful
814 815
 	 */
@@ -1063,7 +1064,7 @@  discard block
 block discarded – undo
1063 1064
 
1064 1065
 	/**
1065 1066
 	 * @param string $name
1066
-	 * @return bool|mixed|string
1067
+	 * @return string
1067 1068
 	 */
1068 1069
 	public function sanitizeUsername($name) {
1069 1070
 		if($this->connection->ldapIgnoreNamingRules) {
@@ -1087,6 +1088,7 @@  discard block
 block discarded – undo
1087 1088
 	* escapes (user provided) parts for LDAP filter
1088 1089
 	* @param string $input, the provided value
1089 1090
 	* @param bool $allowAsterisk whether in * at the beginning should be preserved
1091
+	* @param string $input
1090 1092
 	* @return string the escaped string
1091 1093
 	*/
1092 1094
 	public function escapeFilterPart($input, $allowAsterisk = false) {
Please login to merge, or discard this patch.
apps/user_ldap/lib/Connection.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -564,7 +564,7 @@
 block discarded – undo
564 564
 	/**
565 565
 	 * @param string $host
566 566
 	 * @param string $port
567
-	 * @return false|void
567
+	 * @return boolean
568 568
 	 * @throws \OC\ServerNotAvailableException
569 569
 	 */
570 570
 	private function doConnect($host, $port) {
Please login to merge, or discard this patch.