Completed
Pull Request — stable7 (#24167)
by Lukas
07:55
created
apps/files_sharing/tests/sharedmount.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -228,6 +228,10 @@
 block discarded – undo
228 228
 }
229 229
 
230 230
 class DummyTestClassSharedMount extends \OCA\Files_Sharing\SharedMount {
231
+
232
+	/**
233
+	 * @param string $path
234
+	 */
231 235
 	public function stripUserFilesPathDummy($path) {
232 236
 		return $this->stripUserFilesPath($path);
233 237
 	}
Please login to merge, or discard this patch.
apps/files_trashbin/lib/trashbin.php 1 patch
Doc Comments   +10 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,6 +37,9 @@  discard block
 block discarded – undo
37 37
 	 */
38 38
 	private static $scannedVersions = false;
39 39
 
40
+	/**
41
+	 * @param string $filename
42
+	 */
40 43
 	public static function getUidAndFilename($filename) {
41 44
 		$uid = \OC\Files\Filesystem::getOwner($filename);
42 45
 		\OC\Files\Filesystem::initMountPoints($uid);
@@ -104,7 +107,7 @@  discard block
 block discarded – undo
104 107
 	 * move file to the trash bin
105 108
 	 *
106 109
 	 * @param string $file_path path to the deleted file/directory relative to the files root directory
107
-	 * @return bool
110
+	 * @return false|null
108 111
 	 */
109 112
 	public static function move2trash($file_path) {
110 113
 		$user = \OCP\User::getUser();
@@ -613,6 +616,9 @@  discard block
 block discarded – undo
613 616
 
614 617
 	/**
615 618
 	 * @param \OC\Files\View $view
619
+	 * @param string $file
620
+	 * @param string $filename
621
+	 * @param integer|null $timestamp
616 622
 	 */
617 623
 	private static function deleteVersions($view, $file, $filename, $timestamp) {
618 624
 		$size = 0;
@@ -638,6 +644,9 @@  discard block
 block discarded – undo
638 644
 
639 645
 	/**
640 646
 	 * @param \OC\Files\View $view
647
+	 * @param string $file
648
+	 * @param string $filename
649
+	 * @param integer|null $timestamp
641 650
 	 */
642 651
 	private static function deleteEncryptionKeys($view, $file, $filename, $timestamp) {
643 652
 		$size = 0;
Please login to merge, or discard this patch.
apps/files_versions/lib/versions.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -531,6 +531,7 @@
 block discarded – undo
531 531
 
532 532
 	/**
533 533
 	 * Erase a file's versions which exceed the set quota
534
+	 * @param integer $versionsSize
534 535
 	 */
535 536
 	private static function expire($filename, $versionsSize = null, $offset = 0) {
536 537
 		$config = \OC::$server->getConfig();
Please login to merge, or discard this patch.
apps/user_ldap/lib/access.php 1 patch
Doc Comments   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -752,7 +752,7 @@  discard block
 block discarded – undo
752 752
 
753 753
 	/**
754 754
 	 * @param string $filter
755
-	 * @param string|string[] $attr
755
+	 * @param string[] $attr
756 756
 	 * @param int $limit
757 757
 	 * @param int $offset
758 758
 	 * @return false|int
@@ -791,6 +791,7 @@  discard block
 block discarded – undo
791 791
 	 * retrieved. Results will according to the order in the array.
792 792
 	 * @param int $limit optional, maximum results to be counted
793 793
 	 * @param int $offset optional, a starting point
794
+	 * @param string $filter
794 795
 	 * @return array|false array with the search result as first value and pagedSearchOK as
795 796
 	 * second | false if not successful
796 797
 	 */
@@ -1046,7 +1047,7 @@  discard block
 block discarded – undo
1046 1047
 
1047 1048
 	/**
1048 1049
 	 * @param string $name
1049
-	 * @return bool|mixed|string
1050
+	 * @return string
1050 1051
 	 */
1051 1052
 	public function sanitizeUsername($name) {
1052 1053
 		if($this->connection->ldapIgnoreNamingRules) {
@@ -1070,6 +1071,7 @@  discard block
 block discarded – undo
1070 1071
 	* escapes (user provided) parts for LDAP filter
1071 1072
 	* @param string $input, the provided value
1072 1073
 	* @param bool $allowAsterisk whether in * at the beginning should be preserved
1074
+	* @param string $input
1073 1075
 	* @return string the escaped string
1074 1076
 	*/
1075 1077
 	public function escapeFilterPart($input, $allowAsterisk = false) {
@@ -1480,7 +1482,7 @@  discard block
 block discarded – undo
1480 1482
 
1481 1483
 	/**
1482 1484
 	 * Check whether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search.
1483
-	 * @return boolean|null true on success, null or false otherwise
1485
+	 * @return boolean true on success, null or false otherwise
1484 1486
 	 */
1485 1487
 	public function getPagedSearchResultState() {
1486 1488
 		$result = $this->pagedSearchedSuccessful;
@@ -1495,7 +1497,7 @@  discard block
 block discarded – undo
1495 1497
 	 * @param string[] $attr optional, when a certain attribute shall be filtered outside
1496 1498
 	 * @param int $limit
1497 1499
 	 * @param int $offset
1498
-	 * @return bool|true
1500
+	 * @return boolean
1499 1501
 	 */
1500 1502
 	private function initPagedSearch($filter, $bases, $attr, $limit, $offset) {
1501 1503
 		$pagedSearchOK = false;
Please login to merge, or discard this patch.
apps/user_ldap/lib/jobs/cleanup.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 	}
69 69
 
70 70
 	/**
71
-	 * @return int
71
+	 * @return string
72 72
 	 */
73 73
 	static private function getRefreshInterval() {
74 74
 		//defaults to every hour
Please login to merge, or discard this patch.
apps/user_ldap/lib/user/manager.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 	 * property array
111 111
 	 * @param string the DN of the user
112 112
 	 * @param string the internal (owncloud) username
113
-	 * @return \OCA\user_ldap\lib\User
113
+	 * @return User
114 114
 	 */
115 115
 	private function createAndCache($dn, $uid) {
116 116
 		$this->checkAccess();
Please login to merge, or discard this patch.
apps/user_ldap/user_ldap.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	 * Check if the password is correct
57 57
 	 * @param string $uid The username
58 58
 	 * @param string $password The password
59
-	 * @return boolean
59
+	 * @return false|string
60 60
 	 *
61 61
 	 * Check if the password is correct without logging in the user
62 62
 	 */
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 
148 148
 	/**
149 149
 	 * checks whether a user is still available on LDAP
150
-	 * @param string|\OCA\User_LDAP\lib\user\User $user either the ownCloud user
150
+	 * @param lib\user\User $user either the ownCloud user
151 151
 	 * name or an instance of that user
152 152
 	 * @return bool
153 153
 	 */
Please login to merge, or discard this patch.
core/lostpassword/controller/lostcontroller.php 1 patch
Doc Comments   +16 added lines patch added patch discarded remove patch
@@ -52,6 +52,11 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	protected $userSession;
54 54
 
55
+	/**
56
+	 * @param \OC_Defaults $defaults
57
+	 * @param string $from
58
+	 * @param boolean $isDataEncrypted
59
+	 */
55 60
 	public function __construct($appName,
56 61
 	                            IRequest $request,
57 62
 	                            IURLGenerator $urlGenerator,
@@ -94,6 +99,9 @@  discard block
 block discarded – undo
94 99
 		);
95 100
 	}
96 101
 
102
+	/**
103
+	 * @param string $message
104
+	 */
97 105
 	private function error($message, array $additional=array()) {
98 106
 		return array_merge(array('status' => 'error', 'msg' => $message), $additional);
99 107
 	}
@@ -149,6 +157,10 @@  discard block
 block discarded – undo
149 157
 	}
150 158
 
151 159
 
160
+	/**
161
+	 * @param string $user
162
+	 * @param boolean $proceed
163
+	 */
152 164
 	protected function sendEmail($user, $proceed) {
153 165
 		if ($this->isDataEncrypted && !$proceed){
154 166
 			throw new EncryptedDataException();
@@ -201,6 +213,10 @@  discard block
 block discarded – undo
201 213
 	}
202 214
 
203 215
 
216
+	/**
217
+	 * @param string $route
218
+	 * @param string $token
219
+	 */
204 220
 	protected function getLink($route, $user, $token){
205 221
 		$parameters = array(
206 222
 			'token' => $token,
Please login to merge, or discard this patch.
lib/private/api.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@
 block discarded – undo
129 129
 	/**
130 130
 	 * merge the returned result objects into one response
131 131
 	 * @param array $responses
132
-	 * @return array|\OC_OCS_Result
132
+	 * @return OC_OCS_Result
133 133
 	 */
134 134
 	public static function mergeResponses($responses) {
135 135
 		// Sort into shipped and thirdparty
Please login to merge, or discard this patch.