Completed
Pull Request — master (#31159)
by Martin
12:03
created
lib/private/DateTimeFormatter.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	/**
94 94
 	 * Formats the date of the given timestamp
95 95
 	 *
96
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
96
+	 * @param integer	$timestamp	Either a Unix timestamp or DateTime object
97 97
 	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
98 98
 	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
99 99
 	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 	/**
193 193
 	 * Gives the relative past time of the timestamp
194 194
 	 *
195
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
195
+	 * @param integer	$timestamp	Either a Unix timestamp or DateTime object
196 196
 	 * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
197 197
 	 * @return string	Dates returned are:
198 198
 	 * 				< 60 sec	=> seconds ago
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 	/**
229 229
 	 * Formats the date and time of the given timestamp
230 230
 	 *
231
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
231
+	 * @param integer $timestamp	Either a Unix timestamp or DateTime object
232 232
 	 * @param string		$formatDate		See formatDate() for description
233 233
 	 * @param string		$formatTime		See formatTime() for description
234 234
 	 * @param \DateTimeZone	$timeZone	The timezone to use
Please login to merge, or discard this patch.
lib/private/Files/Cache/Scanner.php 1 patch
Doc Comments   +11 added lines patch added patch discarded remove patch
@@ -383,6 +383,14 @@  discard block
 block discarded – undo
383 383
 		return $size;
384 384
 	}
385 385
 
386
+	/**
387
+	 * @param string $path
388
+	 * @param boolean $recursive
389
+	 * @param integer $reuse
390
+	 * @param integer|null $folderId
391
+	 * @param boolean $lock
392
+	 * @param integer $size
393
+	 */
386 394
 	private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$size) {
387 395
 		// we put this in it's own function so it cleans up the memory before we start recursing
388 396
 		$existingChildren = $this->getExistingChildren($folderId);
@@ -479,6 +487,9 @@  discard block
 block discarded – undo
479 487
 		}
480 488
 	}
481 489
 
490
+	/**
491
+	 * @param string|boolean $path
492
+	 */
482 493
 	private function runBackgroundScanJob(callable $callback, $path) {
483 494
 		try {
484 495
 			$callback();
Please login to merge, or discard this patch.
lib/private/legacy/api.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -329,7 +329,7 @@
 block discarded – undo
329 329
 
330 330
 	/**
331 331
 	 * http basic auth
332
-	 * @return string|false (username, or false on failure)
332
+	 * @return string (username, or false on failure)
333 333
 	 */
334 334
 	private static function loginUser() {
335 335
 		if(self::$isLoggedIn === true) {
Please login to merge, or discard this patch.
lib/private/legacy/eventsource.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
 	 * send a message to the client
89 89
 	 *
90 90
 	 * @param string $type
91
-	 * @param mixed $data
91
+	 * @param string $data
92 92
 	 *
93 93
 	 * @throws \BadMethodCallException
94 94
 	 * if only one parameter is given, a typeless message will be send with that parameter as data
Please login to merge, or discard this patch.
apps/updatenotification/lib/Notification/Notifier.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -103,6 +103,9 @@
 block discarded – undo
103 103
 		return \OC_App::getAppVersions();
104 104
 	}
105 105
 
106
+	/**
107
+	 * @param string $appId
108
+	 */
106 109
 	protected function getAppInfo($appId) {
107 110
 		return \OC_App::getAppInfo($appId);
108 111
 	}
Please login to merge, or discard this patch.
lib/public/App/ManagerEvent.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	 * DispatcherEvent constructor.
47 47
 	 *
48 48
 	 * @param string $event
49
-	 * @param $appID
49
+	 * @param string $appID
50 50
 	 * @param \OCP\IGroup[] $groups
51 51
 	 * @since 9.0.0
52 52
 	 */
Please login to merge, or discard this patch.
apps/federation/lib/DbHandler.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -271,8 +271,8 @@
 block discarded – undo
271 271
 	}
272 272
 
273 273
 	/**
274
-	 * @param $username
275
-	 * @param $password
274
+	 * @param string $username
275
+	 * @param string $password
276 276
 	 * @return bool
277 277
 	 */
278 278
 	public function auth($username, $password) {
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/SyncService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -227,7 +227,7 @@
 block discarded – undo
227 227
 	}
228 228
 
229 229
 	/**
230
-	 * @return array|null
230
+	 * @return string
231 231
 	 */
232 232
 	public function getLocalSystemAddressBook() {
233 233
 		if (is_null($this->localSystemAddressBook)) {
Please login to merge, or discard this patch.
apps/dav/lib/DAV/SystemPrincipalBackend.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@
 block discarded – undo
136 136
 	 * Returns the list of members for a group-principal
137 137
 	 *
138 138
 	 * @param string $principal
139
-	 * @return array
139
+	 * @return string[]
140 140
 	 */
141 141
 	function getGroupMemberSet($principal) {
142 142
 		// TODO: for now the group principal has only one member, the user itself
Please login to merge, or discard this patch.