@@ -1166,7 +1166,7 @@ |
||
| 1166 | 1166 | * Get the certificate manager for the user |
| 1167 | 1167 | * |
| 1168 | 1168 | * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager |
| 1169 | - * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in |
|
| 1169 | + * @return null|CertificateManager | null if $uid is null and no user is logged in |
|
| 1170 | 1170 | */ |
| 1171 | 1171 | public function getCertificateManager($userId = '') { |
| 1172 | 1172 | if ($userId === '') { |
@@ -46,8 +46,6 @@ |
||
| 46 | 46 | use OC\AppFramework\Utility\TimeFactory; |
| 47 | 47 | use OC\Command\AsyncBus; |
| 48 | 48 | use OC\Diagnostics\EventLogger; |
| 49 | -use OC\Diagnostics\NullEventLogger; |
|
| 50 | -use OC\Diagnostics\NullQueryLogger; |
|
| 51 | 49 | use OC\Diagnostics\QueryLogger; |
| 52 | 50 | use OC\Files\Config\UserMountCache; |
| 53 | 51 | use OC\Files\Config\UserMountCacheListener; |
@@ -742,11 +742,19 @@ discard block |
||
| 742 | 742 | } |
| 743 | 743 | |
| 744 | 744 | // case-insensitive array_search |
| 745 | + |
|
| 746 | + /** |
|
| 747 | + * @param string $needle |
|
| 748 | + */ |
|
| 745 | 749 | protected function array_searchi($needle, $haystack, $mem='getName') { |
| 746 | 750 | if(!is_array($haystack)) { |
| 747 | 751 | return false; |
| 748 | 752 | } |
| 749 | 753 | return array_search(strtolower($needle), array_map( |
| 754 | + |
|
| 755 | + /** |
|
| 756 | + * @param string $tag |
|
| 757 | + */ |
|
| 750 | 758 | function($tag) use($mem) { |
| 751 | 759 | return strtolower(call_user_func([$tag, $mem])); |
| 752 | 760 | }, $haystack) |
@@ -771,7 +779,7 @@ discard block |
||
| 771 | 779 | * Get a tag by its name. |
| 772 | 780 | * |
| 773 | 781 | * @param string $name The tag name. |
| 774 | - * @return integer|bool The tag object's offset within the $this->tags |
|
| 782 | + * @return \OCP\AppFramework\Db\Entity The tag object's offset within the $this->tags |
|
| 775 | 783 | * array or false if it doesn't exist. |
| 776 | 784 | */ |
| 777 | 785 | private function getTagByName($name) { |
@@ -782,7 +790,7 @@ discard block |
||
| 782 | 790 | * Get a tag by its ID. |
| 783 | 791 | * |
| 784 | 792 | * @param string $id The tag ID to look for. |
| 785 | - * @return integer|bool The tag object's offset within the $this->tags |
|
| 793 | + * @return \OCP\AppFramework\Db\Entity The tag object's offset within the $this->tags |
|
| 786 | 794 | * array or false if it doesn't exist. |
| 787 | 795 | */ |
| 788 | 796 | private function getTagById($id) { |
@@ -30,7 +30,6 @@ |
||
| 30 | 30 | * StorageAuthException constructor. |
| 31 | 31 | * |
| 32 | 32 | * @param string $message |
| 33 | - * @param int $code |
|
| 34 | 33 | * @param \Exception $previous |
| 35 | 34 | * @since 9.0.0 |
| 36 | 35 | */ |
@@ -30,7 +30,6 @@ |
||
| 30 | 30 | * ExtStorageBadConfigException constructor. |
| 31 | 31 | * |
| 32 | 32 | * @param string $message |
| 33 | - * @param int $code |
|
| 34 | 33 | * @param \Exception $previous |
| 35 | 34 | * @since 9.0.0 |
| 36 | 35 | */ |
@@ -30,7 +30,6 @@ |
||
| 30 | 30 | * StorageConnectionException constructor. |
| 31 | 31 | * |
| 32 | 32 | * @param string $message |
| 33 | - * @param int $code |
|
| 34 | 33 | * @param \Exception $previous |
| 35 | 34 | * @since 9.0.0 |
| 36 | 35 | */ |
@@ -32,18 +32,21 @@ discard block |
||
| 32 | 32 | /** |
| 33 | 33 | * @param string $message |
| 34 | 34 | * @since 9.1.0 |
| 35 | + * @return void |
|
| 35 | 36 | */ |
| 36 | 37 | public function info($message); |
| 37 | 38 | |
| 38 | 39 | /** |
| 39 | 40 | * @param string $message |
| 40 | 41 | * @since 9.1.0 |
| 42 | + * @return void |
|
| 41 | 43 | */ |
| 42 | 44 | public function warning($message); |
| 43 | 45 | |
| 44 | 46 | /** |
| 45 | 47 | * @param int $max |
| 46 | 48 | * @since 9.1.0 |
| 49 | + * @return void |
|
| 47 | 50 | */ |
| 48 | 51 | public function startProgress($max = 0); |
| 49 | 52 | |
@@ -51,12 +54,13 @@ discard block |
||
| 51 | 54 | * @param int $step |
| 52 | 55 | * @param string $description |
| 53 | 56 | * @since 9.1.0 |
| 57 | + * @return void |
|
| 54 | 58 | */ |
| 55 | 59 | public function advance($step = 1, $description = ''); |
| 56 | 60 | |
| 57 | 61 | /** |
| 58 | - * @param int $max |
|
| 59 | 62 | * @since 9.1.0 |
| 63 | + * @return void |
|
| 60 | 64 | */ |
| 61 | 65 | public function finishProgress(); |
| 62 | 66 | |
@@ -213,6 +213,10 @@ discard block |
||
| 213 | 213 | |
| 214 | 214 | /** |
| 215 | 215 | * |
| 216 | + * @param string $user |
|
| 217 | + * @param string $targetFilename |
|
| 218 | + * @param string $targetLocation |
|
| 219 | + * @param integer $timestamp |
|
| 216 | 220 | */ |
| 217 | 221 | public static function insertTrashEntry($user, $targetFilename, $targetLocation, $timestamp) { |
| 218 | 222 | $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)"); |
@@ -756,7 +760,7 @@ discard block |
||
| 756 | 760 | * if the size limit for the trash bin is reached, we delete the oldest |
| 757 | 761 | * files in the trash bin until we meet the limit again |
| 758 | 762 | * |
| 759 | - * @param array $files |
|
| 763 | + * @param \OCP\Files\FileInfo[] $files |
|
| 760 | 764 | * @param string $user |
| 761 | 765 | * @param int $availableSpace available disc space |
| 762 | 766 | * @return int size of deleted files |
@@ -784,7 +788,7 @@ discard block |
||
| 784 | 788 | /** |
| 785 | 789 | * delete files older then max storage time |
| 786 | 790 | * |
| 787 | - * @param array $files list of files sorted by mtime |
|
| 791 | + * @param \OCP\Files\FileInfo[] $files list of files sorted by mtime |
|
| 788 | 792 | * @param string $user |
| 789 | 793 | * @return integer[] size of deleted files and number of deleted files |
| 790 | 794 | */ |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | /** |
| 121 | 121 | * List all installed apps |
| 122 | 122 | * |
| 123 | - * @return string[] |
|
| 123 | + * @return integer[] |
|
| 124 | 124 | */ |
| 125 | 125 | public function getInstalledApps() { |
| 126 | 126 | return array_keys($this->getInstalledAppsValues()); |
@@ -347,6 +347,9 @@ discard block |
||
| 347 | 347 | return in_array($appId, $this->shippedApps); |
| 348 | 348 | } |
| 349 | 349 | |
| 350 | + /** |
|
| 351 | + * @param string $appId |
|
| 352 | + */ |
|
| 350 | 353 | private function isAlwaysEnabled($appId) { |
| 351 | 354 | $alwaysEnabled = $this->getAlwaysEnabledApps(); |
| 352 | 355 | return in_array($appId, $alwaysEnabled); |
@@ -374,7 +377,7 @@ discard block |
||
| 374 | 377 | |
| 375 | 378 | /** |
| 376 | 379 | * @param string $package |
| 377 | - * @return mixed |
|
| 380 | + * @return integer |
|
| 378 | 381 | * @since 10.0 |
| 379 | 382 | */ |
| 380 | 383 | public function installApp($package) { |
@@ -386,7 +389,7 @@ discard block |
||
| 386 | 389 | |
| 387 | 390 | /** |
| 388 | 391 | * @param string $package |
| 389 | - * @return mixed |
|
| 392 | + * @return boolean |
|
| 390 | 393 | * @since 10.0 |
| 391 | 394 | */ |
| 392 | 395 | public function updateApp($package) { |
@@ -807,9 +807,6 @@ |
||
| 807 | 807 | /** |
| 808 | 808 | * List all apps, this is used in apps.php |
| 809 | 809 | * |
| 810 | - * @param bool $onlyLocal |
|
| 811 | - * @param bool $includeUpdateInfo Should we check whether there is an update |
|
| 812 | - * in the app store? |
|
| 813 | 810 | * @return array |
| 814 | 811 | */ |
| 815 | 812 | public static function listAllApps() { |