@@ -554,7 +554,7 @@ |
||
| 554 | 554 | * |
| 555 | 555 | * @param string $path |
| 556 | 556 | * @param \OCP\Files\FileInfo $rootInfo (optional) |
| 557 | - * @return array |
|
| 557 | + * @return string |
|
| 558 | 558 | * @throws \OCP\Files\NotFoundException |
| 559 | 559 | */ |
| 560 | 560 | public static function getStorageInfo($path, $rootInfo = null) { |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | * make preview_icon available as a simple function |
| 183 | 183 | * Returns the path to the preview of the image. |
| 184 | 184 | * @param string $path path of file |
| 185 | - * @return link to the preview |
|
| 185 | + * @return string to the preview |
|
| 186 | 186 | */ |
| 187 | 187 | function preview_icon( $path ) { |
| 188 | 188 | return \OC::$server->getURLGenerator()->linkToRoute('core_ajax_preview', ['x' => 32, 'y' => 32, 'file' => $path]); |
@@ -190,6 +190,7 @@ discard block |
||
| 190 | 190 | |
| 191 | 191 | /** |
| 192 | 192 | * @param string $path |
| 193 | + * @param string $token |
|
| 193 | 194 | */ |
| 194 | 195 | function publicPreview_icon ( $path, $token ) { |
| 195 | 196 | return \OC::$server->getURLGenerator()->linkToRoute('core_ajax_public_preview', ['x' => 32, 'y' => 32, 'file' => $path, 't' => $token]); |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | * Set a value in the cache if it's not already stored |
| 65 | 65 | * |
| 66 | 66 | * @param string $key |
| 67 | - * @param mixed $value |
|
| 67 | + * @param integer $value |
|
| 68 | 68 | * @param int $ttl Time To Live in seconds. Defaults to 60*60*24 |
| 69 | 69 | * @return bool |
| 70 | 70 | */ |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | * Set a value in the cache if it's not already stored |
| 65 | 65 | * |
| 66 | 66 | * @param string $key |
| 67 | - * @param mixed $value |
|
| 67 | + * @param integer $value |
|
| 68 | 68 | * @param int $ttl Time To Live in seconds. Defaults to 60*60*24 |
| 69 | 69 | * @return bool |
| 70 | 70 | */ |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | * Set a value in the cache if it's not already stored |
| 65 | 65 | * |
| 66 | 66 | * @param string $key |
| 67 | - * @param mixed $value |
|
| 67 | + * @param integer $value |
|
| 68 | 68 | * @param int $ttl Time To Live in seconds. Defaults to 60*60*24 |
| 69 | 69 | * @return bool |
| 70 | 70 | */ |
@@ -158,7 +158,7 @@ |
||
| 158 | 158 | * Set a value in the cache if it's not already stored |
| 159 | 159 | * |
| 160 | 160 | * @param string $key |
| 161 | - * @param mixed $value |
|
| 161 | + * @param integer $value |
|
| 162 | 162 | * @param int $ttl Time To Live in seconds. Defaults to 60*60*24 |
| 163 | 163 | * @return bool |
| 164 | 164 | * @throws \Exception |
@@ -24,7 +24,6 @@ |
||
| 24 | 24 | use OCP\Security\ICrypto; |
| 25 | 25 | use OCP\IDBConnection; |
| 26 | 26 | use OCP\Security\ICredentialsManager; |
| 27 | -use OCP\IConfig; |
|
| 28 | 27 | |
| 29 | 28 | /** |
| 30 | 29 | * Store and retrieve credentials for external services |
@@ -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) { |