Completed
Pull Request — master (#361)
by Olivier
09:24
created
lib/private/AppFramework/Http.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
 
111 111
 	/**
112 112
 	 * Gets the correct header
113
-	 * @param Http::CONSTANT $status the constant from the Http class
113
+	 * @param integer $status the constant from the Http class
114 114
 	 * @param \DateTime $lastModified formatted last modified date
115 115
 	 * @param string $ETag the etag
116 116
 	 * @return string
Please login to merge, or discard this patch.
lib/private/AppFramework/Utility/ControllerMethodReflector.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
 
47 47
 
48 48
 	/**
49
-	 * @param object $object an object or classname
49
+	 * @param \OCP\AppFramework\Controller $object an object or classname
50 50
 	 * @param string $method the method which we want to inspect
51 51
 	 */
52 52
 	public function reflect($object, $method){
Please login to merge, or discard this patch.
lib/private/Cache/File.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -92,9 +92,9 @@
 block discarded – undo
92 92
 
93 93
 	/**
94 94
 	 * @param string $key
95
-	 * @param mixed $value
95
+	 * @param string|null $value
96 96
 	 * @param int $ttl
97
-	 * @return bool|mixed
97
+	 * @return boolean
98 98
 	 * @throws \OC\ForbiddenException
99 99
 	 */
100 100
 	public function set($key, $value, $ttl = 0) {
Please login to merge, or discard this patch.
lib/private/Comments/Manager.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -205,7 +205,7 @@
 block discarded – undo
205 205
 	/**
206 206
 	 * removes an entry from the comments run time cache
207 207
 	 *
208
-	 * @param mixed $id the comment's id
208
+	 * @param string $id the comment's id
209 209
 	 */
210 210
 	protected function uncache($id) {
211 211
 		$id = strval($id);
Please login to merge, or discard this patch.
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/DB/Connection.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 	 * If an SQLLogger is configured, the execution is logged.
174 174
 	 *
175 175
 	 * @param string                                      $query  The SQL query to execute.
176
-	 * @param array                                       $params The parameters to bind to the query, if any.
176
+	 * @param string[]                                       $params The parameters to bind to the query, if any.
177 177
 	 * @param array                                       $types  The types the previous parameters are in.
178 178
 	 * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp    The query cache profile, optional.
179 179
 	 *
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	 * columns or sequences.
219 219
 	 *
220 220
 	 * @param string $seqName Name of the sequence object from which the ID should be returned.
221
-	 * @return string A string representation of the last inserted ID.
221
+	 * @return integer A string representation of the last inserted ID.
222 222
 	 */
223 223
 	public function lastInsertId($seqName = null) {
224 224
 		if ($seqName) {
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/QueryBuilder.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
307 307
 	 * </code>
308 308
 	 *
309
-	 * @param mixed $select The selection expressions.
309
+	 * @param string $select The selection expressions.
310 310
 	 *
311 311
 	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
312 312
 	 */
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
331 331
 	 * </code>
332 332
 	 *
333
-	 * @param mixed $select The selection expressions.
333
+	 * @param QueryFunction $select The selection expressions.
334 334
 	 * @param string $alias The column alias used in the constructed query.
335 335
 	 *
336 336
 	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
@@ -652,7 +652,7 @@  discard block
 block discarded – undo
652 652
 	 *         ->where($or);
653 653
 	 * </code>
654 654
 	 *
655
-	 * @param mixed $predicates The restriction predicates.
655
+	 * @param CompositeExpression $predicates The restriction predicates.
656 656
 	 *
657 657
 	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
658 658
 	 */
@@ -1034,7 +1034,7 @@  discard block
 block discarded – undo
1034 1034
 	 *
1035 1035
 	 * @param string $name
1036 1036
 	 *
1037
-	 * @return IParameter
1037
+	 * @return string
1038 1038
 	 */
1039 1039
 	public function createParameter($name) {
1040 1040
 		return new Parameter(':' . $name);
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
@@ -386,6 +386,14 @@  discard block
 block discarded – undo
386 386
 		return $size;
387 387
 	}
388 388
 
389
+	/**
390
+	 * @param string $path
391
+	 * @param boolean $recursive
392
+	 * @param integer $reuse
393
+	 * @param integer|null $folderId
394
+	 * @param boolean $lock
395
+	 * @param integer $size
396
+	 */
389 397
 	private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$size) {
390 398
 		// we put this in it's own function so it cleans up the memory before we start recursing
391 399
 		$existingChildren = $this->getExistingChildren($folderId);
@@ -485,6 +493,9 @@  discard block
 block discarded – undo
485 493
 		}
486 494
 	}
487 495
 
496
+	/**
497
+	 * @param string|boolean $path
498
+	 */
488 499
 	private function runBackgroundScanJob(callable $callback, $path) {
489 500
 		try {
490 501
 			$callback();
Please login to merge, or discard this patch.
lib/private/Files/Cache/Wrapper/CacheJail.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
 	/**
72 72
 	 * @param array $entry
73
-	 * @return array
73
+	 * @return string
74 74
 	 */
75 75
 	protected function formatCacheEntry($entry) {
76 76
 		if (isset($entry['path'])) {
@@ -189,6 +189,9 @@  discard block
 block discarded – undo
189 189
 		return $this->cache->getStatus($this->getSourcePath($file));
190 190
 	}
191 191
 
192
+	/**
193
+	 * @param \OCP\Files\Cache\ICacheEntry[] $results
194
+	 */
192 195
 	private function formatSearchResults($results) {
193 196
 		$results = array_filter($results, array($this, 'filterCacheEntry'));
194 197
 		$results = array_values($results);
@@ -274,7 +277,7 @@  discard block
 block discarded – undo
274 277
 	 * use the one with the highest id gives the best result with the background scanner, since that is most
275 278
 	 * likely the folder where we stopped scanning previously
276 279
 	 *
277
-	 * @return string|bool the path of the folder or false when no folder matched
280
+	 * @return boolean the path of the folder or false when no folder matched
278 281
 	 */
279 282
 	public function getIncomplete() {
280 283
 		// not supported
Please login to merge, or discard this patch.