Completed
Pull Request — stable8.2 (#25503)
by Thomas
18:30
created
lib/private/encryption/util.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 OC\Files\Filesystem;
31 31
 use OC\Files\View;
32 32
 use OCP\Encryption\IEncryptionModule;
33
-use OCP\Files\Storage;
34 33
 use OCP\IConfig;
35 34
 
36 35
 class Util {
Please login to merge, or discard this patch.
apps/files_trashbin/lib/backgroundjob/expiretrash.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,6 @@
 block discarded – undo
20 20
  */
21 21
 
22 22
 use OC\Share\MailNotifications;
23
-use OCP\IConfig;
24 23
 use OCP\IL10N;
25 24
 use OCP\IUser;
26 25
 use OCP\Mail\IMailer;
Please login to merge, or discard this patch.
apps/user_ldap/lib/access.php 1 patch
Doc Comments   +7 added lines, -5 removed lines patch added patch discarded remove patch
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 
392 392
 	/**
393 393
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
394
-	 * @param string $dn the dn of the user object
394
+	 * @param string $fdn the dn of the user object
395 395
 	 * @param string $ldapName optional, the display name of the object
396 396
 	 * @return string|false with with the name to use in ownCloud
397 397
 	 */
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 
409 409
 	/**
410 410
 	 * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN
411
-	 * @param string $dn the dn of the user object
411
+	 * @param string $fdn the dn of the user object
412 412
 	 * @param string $ldapName optional, the display name of the object
413 413
 	 * @param bool $isUser optional, whether it is a user object (otherwise group assumed)
414 414
 	 * @return string|false with with the name to use in ownCloud
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
 	 * the login filter.
669 669
 	 *
670 670
 	 * @param string $loginName
671
-	 * @param array $attributes optional, list of attributes to read
671
+	 * @param string[] $attributes optional, list of attributes to read
672 672
 	 * @return array
673 673
 	 */
674 674
 	public function fetchUsersByLoginName($loginName, $attributes = array('dn')) {
@@ -782,7 +782,7 @@  discard block
 block discarded – undo
782 782
 
783 783
 	/**
784 784
 	 * @param string $filter
785
-	 * @param string|string[] $attr
785
+	 * @param string[] $attr
786 786
 	 * @param int $limit
787 787
 	 * @param int $offset
788 788
 	 * @return false|int
@@ -832,6 +832,7 @@  discard block
 block discarded – undo
832 832
 	 * retrieved. Results will according to the order in the array.
833 833
 	 * @param int $limit optional, maximum results to be counted
834 834
 	 * @param int $offset optional, a starting point
835
+	 * @param string $filter
835 836
 	 * @return array|false array with the search result as first value and pagedSearchOK as
836 837
 	 * second | false if not successful
837 838
 	 */
@@ -1073,7 +1074,7 @@  discard block
 block discarded – undo
1073 1074
 
1074 1075
 	/**
1075 1076
 	 * @param string $name
1076
-	 * @return bool|mixed|string
1077
+	 * @return string
1077 1078
 	 */
1078 1079
 	public function sanitizeUsername($name) {
1079 1080
 		if($this->connection->ldapIgnoreNamingRules) {
@@ -1097,6 +1098,7 @@  discard block
 block discarded – undo
1097 1098
 	* escapes (user provided) parts for LDAP filter
1098 1099
 	* @param string $input, the provided value
1099 1100
 	* @param bool $allowAsterisk whether in * at the beginning should be preserved
1101
+	* @param string $input
1100 1102
 	* @return string the escaped string
1101 1103
 	*/
1102 1104
 	public function escapeFilterPart($input, $allowAsterisk = false) {
Please login to merge, or discard this patch.
apps/user_ldap/lib/wizard.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1100,7 +1100,7 @@
 block discarded – undo
1100 1100
 	}
1101 1101
 
1102 1102
 	/**
1103
-	 * @param array $reqs
1103
+	 * @param string[] $reqs
1104 1104
 	 * @return bool
1105 1105
 	 */
1106 1106
 	private function checkRequirements($reqs) {
Please login to merge, or discard this patch.
lib/private/api.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 
327 327
 	/**
328 328
 	 * http basic auth
329
-	 * @return string|false (username, or false on failure)
329
+	 * @return string (username, or false on failure)
330 330
 	 */
331 331
 	private static function loginUser() {
332 332
 		if(self::$isLoggedIn === true) {
@@ -432,6 +432,7 @@  discard block
 block discarded – undo
432 432
 
433 433
 	/**
434 434
 	 * Based on the requested format the response content type is set
435
+	 * @param string $format
435 436
 	 */
436 437
 	public static function setContentType($format = null) {
437 438
 		$format = is_null($format) ? self::requestedFormat() : $format;
Please login to merge, or discard this patch.
lib/private/connector/sabre/file.php 1 patch
Doc Comments   +7 added lines, -1 removed lines patch added patch discarded remove patch
@@ -217,6 +217,9 @@  discard block
 block discarded – undo
217 217
 		return '"' . $this->info->getEtag() . '"';
218 218
 	}
219 219
 
220
+	/**
221
+	 * @param string $path
222
+	 */
220 223
 	private function getPartFileBasePath($path) {
221 224
 		$partFileInStorage = \OC::$server->getConfig()->getSystemValue('part_file_in_storage', true);
222 225
 		if ($partFileInStorage) {
@@ -254,6 +257,9 @@  discard block
 block discarded – undo
254 257
 		return $run;
255 258
 	}
256 259
 
260
+	/**
261
+	 * @param string $path
262
+	 */
257 263
 	private function emitPostHooks($exists, $path = null) {
258 264
 		if (is_null($path)) {
259 265
 			$path = $this->path;
@@ -326,7 +332,7 @@  discard block
 block discarded – undo
326 332
 	 *
327 333
 	 * If null is returned, we'll assume application/octet-stream
328 334
 	 *
329
-	 * @return mixed
335
+	 * @return string
330 336
 	 */
331 337
 	public function getContentType() {
332 338
 		$mimeType = $this->info->getMimetype();
Please login to merge, or discard this patch.
lib/private/db.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 	/**
161 161
 	 * gets last value of autoincrement
162 162
 	 * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
163
-	 * @return string id
163
+	 * @return integer id
164 164
 	 * @throws \OC\DatabaseException
165 165
 	 *
166 166
 	 * \Doctrine\DBAL\Connection lastInsertId
@@ -196,7 +196,6 @@  discard block
 block discarded – undo
196 196
 	/**
197 197
 	 * saves database schema to xml file
198 198
 	 * @param string $file name of file
199
-	 * @param int $mode
200 199
 	 * @return bool
201 200
 	 *
202 201
 	 * TODO: write more documentation
Please login to merge, or discard this patch.
lib/private/db/mdb2schemamanager.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,6 @@
 block discarded – undo
49 49
 	/**
50 50
 	 * saves database scheme to xml file
51 51
 	 * @param string $file name of file
52
-	 * @param int|string $mode
53 52
 	 * @return bool
54 53
 	 *
55 54
 	 * TODO: write more documentation
Please login to merge, or discard this patch.
tests/lib/connector/sabre/requesttest/auth.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
 	 * Checks if output formatter has style with specified name.
72 72
 	 *
73 73
 	 * @param string $name
74
-	 * @return bool
74
+	 * @return boolean|null
75 75
 	 */
76 76
 	public function hasStyle($name) {
77 77
 		$this->formatter->hasStyle($name);
Please login to merge, or discard this patch.