@@ -23,7 +23,6 @@ |
||
| 23 | 23 | |
| 24 | 24 | namespace OC\App; |
| 25 | 25 | |
| 26 | -use OC_Util; |
|
| 27 | 26 | use OCP\IConfig; |
| 28 | 27 | |
| 29 | 28 | /** |
@@ -110,7 +110,7 @@ |
||
| 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 |
@@ -46,7 +46,7 @@ |
||
| 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){ |
@@ -92,9 +92,9 @@ |
||
| 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) { |
@@ -205,7 +205,7 @@ |
||
| 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); |
@@ -93,7 +93,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
@@ -173,7 +173,7 @@ discard block |
||
| 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 |
||
| 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) { |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | private $noEmit = false; |
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | - * @param \Doctrine\DBAL\Connection|Connection $connection |
|
| 63 | + * @param Connection $connection |
|
| 64 | 64 | * @param ISecureRandom $random |
| 65 | 65 | * @param IConfig $config |
| 66 | 66 | * @param EventDispatcher $dispatcher |
@@ -273,6 +273,10 @@ discard block |
||
| 273 | 273 | return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/'; |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | + /** |
|
| 277 | + * @param integer $step |
|
| 278 | + * @param integer $max |
|
| 279 | + */ |
|
| 276 | 280 | protected function emit($sql, $step, $max) { |
| 277 | 281 | if ($this->noEmit) { |
| 278 | 282 | return; |
@@ -283,6 +287,10 @@ discard block |
||
| 283 | 287 | $this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max])); |
| 284 | 288 | } |
| 285 | 289 | |
| 290 | + /** |
|
| 291 | + * @param integer $step |
|
| 292 | + * @param integer $max |
|
| 293 | + */ |
|
| 286 | 294 | private function emitCheckStep($tableName, $step, $max) { |
| 287 | 295 | if(is_null($this->dispatcher)) { |
| 288 | 296 | return; |
@@ -306,7 +306,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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); |