Completed
Pull Request — master (#7195)
by Jan-Christoph
17:09 queued 02:45
created
lib/private/legacy/user.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -363,7 +363,7 @@
 block discarded – undo
363 363
 	 * get the display name of the user currently logged in.
364 364
 	 *
365 365
 	 * @param string $uid
366
-	 * @return string|bool uid or false
366
+	 * @return string|false uid or false
367 367
 	 */
368 368
 	public static function getDisplayName($uid = null) {
369 369
 		if ($uid) {
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/Response.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -261,7 +261,7 @@
 block discarded – undo
261 261
 
262 262
 	/**
263 263
 	 * Get the currently used Content-Security-Policy
264
-	 * @return EmptyContentSecurityPolicy|null Used Content-Security-Policy or null if
264
+	 * @return ContentSecurityPolicy|null Used Content-Security-Policy or null if
265 265
 	 *                                    none specified.
266 266
 	 * @since 8.1.0
267 267
 	 */
Please login to merge, or discard this patch.
lib/public/Template.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
 /**
107 107
  * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
108 108
  * @param int $timestamp unix timestamp
109
- * @param boolean $dateOnly
109
+ * @param integer $dateOnly
110 110
  * @return string human readable interpretation of the timestamp
111 111
  *
112 112
  * @deprecated 8.0.0 Use \OCP\Template::relative_modified_date() instead
Please login to merge, or discard this patch.
lib/private/Archive/ZIP.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -370,6 +370,7 @@
 block discarded – undo
370 370
 
371 371
 	/**
372 372
 	 * write back temporary files
373
+	 * @param string $path
373 374
 	 */
374 375
 	public function writeBack($tmpFile, $path) {
375 376
 		$this->addFile($path, $tmpFile);
Please login to merge, or discard this patch.
lib/private/legacy/helper.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	/**
132 132
 	 * Make a computer file size
133 133
 	 * @param string $str file size in human readable format
134
-	 * @return float|bool a file size in bytes
134
+	 * @return integer a file size in bytes
135 135
 	 *
136 136
 	 * Makes 2kB to 2048.
137 137
 	 *
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
529 529
 	 *
530 530
 	 * @param string $path
531 531
 	 * @param \OCP\Files\FileInfo $rootInfo (optional)
532
-	 * @return array
532
+	 * @return string
533 533
 	 * @throws \OCP\Files\NotFoundException
534 534
 	 */
535 535
 	public static function getStorageInfo($path, $rootInfo = null) {
Please login to merge, or discard this patch.
core/Middleware/TwoFactorMiddleware.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -104,6 +104,9 @@
 block discarded – undo
104 104
 		// TODO: dont check/enforce 2FA if a auth token is used
105 105
 	}
106 106
 
107
+	/**
108
+	 * @param string $methodName
109
+	 */
107 110
 	private function checkTwoFactor(Controller $controller, $methodName, IUser $user) {
108 111
 		// If two-factor auth is in progress disallow access to any controllers
109 112
 		// defined within "LoginController".
Please login to merge, or discard this patch.
lib/private/Contacts/ContactsMenu/ContactsStore.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
 	/**
64 64
 	 * @param IUser $user
65 65
 	 * @param string|null $filter
66
-	 * @return IEntry[]
66
+	 * @return Entry[]
67 67
 	 */
68 68
 	public function getContacts(IUser $user, $filter) {
69 69
 		$allContacts = $this->contactsManager->search($filter ?: '', [
Please login to merge, or discard this patch.
lib/private/User/User.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -450,6 +450,10 @@
 block discarded – undo
450 450
 		return $url;
451 451
 	}
452 452
 
453
+	/**
454
+	 * @param string $feature
455
+	 * @param string $oldValue
456
+	 */
453 457
 	public function triggerChange($feature, $value = null, $oldValue = null) {
454 458
 		if ($this->emitter) {
455 459
 			$this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value, $oldValue));
Please login to merge, or discard this patch.
apps/theming/lib/ThemingDefaults.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,7 +64,6 @@  discard block
 block discarded – undo
64 64
 	 * @param IConfig $config
65 65
 	 * @param IL10N $l
66 66
 	 * @param IURLGenerator $urlGenerator
67
-	 * @param \OC_Defaults $defaults
68 67
 	 * @param IAppData $appData
69 68
 	 * @param ICacheFactory $cacheFactory
70 69
 	 * @param Util $util
@@ -254,7 +253,7 @@  discard block
 block discarded – undo
254 253
 	 *
255 254
 	 * @param string $app name of the app
256 255
 	 * @param string $image filename of the image
257
-	 * @return bool|string false if image should not replaced, otherwise the location of the image
256
+	 * @return string|false false if image should not replaced, otherwise the location of the image
258 257
 	 */
259 258
 	public function replaceImagePath($app, $image) {
260 259
 		if($app==='') {
Please login to merge, or discard this patch.