Completed
Pull Request — master (#25828)
by Jörn Friedrich
10:50
created
apps/user_ldap/lib/Access.php 1 patch
Doc Comments   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
 
396 396
 	/**
397 397
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
398
-	 * @param string $dn the dn of the user object
398
+	 * @param string $fdn the dn of the user object
399 399
 	 * @param string $ldapName optional, the display name of the object
400 400
 	 * @return string|false with with the name to use in ownCloud
401 401
 	 */
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 
413 413
 	/**
414 414
 	 * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN
415
-	 * @param string $dn the dn of the user object
415
+	 * @param string $fdn the dn of the user object
416 416
 	 * @param string $ldapName optional, the display name of the object
417 417
 	 * @param bool $isUser optional, whether it is a user object (otherwise group assumed)
418 418
 	 * @return string|false with with the name to use in ownCloud
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 	 * the login filter.
673 673
 	 *
674 674
 	 * @param string $loginName
675
-	 * @param array $attributes optional, list of attributes to read
675
+	 * @param string[] $attributes optional, list of attributes to read
676 676
 	 * @return array
677 677
 	 */
678 678
 	public function fetchUsersByLoginName($loginName, $attributes = array('dn')) {
@@ -745,7 +745,7 @@  discard block
 block discarded – undo
745 745
 
746 746
 	/**
747 747
 	 * @param string $filter
748
-	 * @param string|string[] $attr
748
+	 * @param string[] $attr
749 749
 	 * @param int $limit
750 750
 	 * @param int $offset
751 751
 	 * @return array
@@ -793,7 +793,7 @@  discard block
 block discarded – undo
793 793
 
794 794
 	/**
795 795
 	 * @param string $filter
796
-	 * @param string|string[] $attr
796
+	 * @param string[] $attr
797 797
 	 * @param int $limit
798 798
 	 * @param int $offset
799 799
 	 * @return false|int
@@ -843,6 +843,7 @@  discard block
 block discarded – undo
843 843
 	 * retrieved. Results will according to the order in the array.
844 844
 	 * @param int $limit optional, maximum results to be counted
845 845
 	 * @param int $offset optional, a starting point
846
+	 * @param string $filter
846 847
 	 * @return array|false array with the search result as first value and pagedSearchOK as
847 848
 	 * second | false if not successful
848 849
 	 */
@@ -1097,7 +1098,7 @@  discard block
 block discarded – undo
1097 1098
 
1098 1099
 	/**
1099 1100
 	 * @param string $name
1100
-	 * @return bool|mixed|string
1101
+	 * @return string
1101 1102
 	 */
1102 1103
 	public function sanitizeUsername($name) {
1103 1104
 		if($this->connection->ldapIgnoreNamingRules) {
@@ -1121,6 +1122,7 @@  discard block
 block discarded – undo
1121 1122
 	* escapes (user provided) parts for LDAP filter
1122 1123
 	* @param string $input, the provided value
1123 1124
 	* @param bool $allowAsterisk whether in * at the beginning should be preserved
1125
+	* @param string $input
1124 1126
 	* @return string the escaped string
1125 1127
 	*/
1126 1128
 	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
@@ -559,7 +559,7 @@
 block discarded – undo
559 559
 	/**
560 560
 	 * @param string $host
561 561
 	 * @param string $port
562
-	 * @return false|void
562
+	 * @return boolean
563 563
 	 * @throws \OC\ServerNotAvailableException
564 564
 	 */
565 565
 	private function doConnect($host, $port) {
Please login to merge, or discard this patch.