diff options
author | Olivier Paroz <github@oparoz.com> | 2015-07-28 02:43:00 +0300 |
---|---|---|
committer | Olivier Paroz <github@oparoz.com> | 2015-07-28 02:43:00 +0300 |
commit | 9827b33eb5b43eadd7ff14b616446fe30f442565 (patch) | |
tree | f8f8ca89b83cfd017b8b0c3d72f4dde2d8e89a97 /controller | |
parent | 135c815d6261f651dcfb082dda5404cb58a672ad (diff) |
Fix problems reported by static analyser
Diffstat (limited to 'controller')
-rw-r--r-- | controller/configcontroller.php | 2 | ||||
-rw-r--r-- | controller/jsonhttperror.php | 2 | ||||
-rw-r--r-- | controller/previewcontroller.php | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/controller/configcontroller.php b/controller/configcontroller.php index f0846954..774f1b7e 100644 --- a/controller/configcontroller.php +++ b/controller/configcontroller.php @@ -73,7 +73,7 @@ class ConfigController extends Controller { * * @param bool $slideshow * - * @return array + * @return array<string,null|array> */ public function getConfig($slideshow = false) { $features = $this->configService->getFeaturesList(); diff --git a/controller/jsonhttperror.php b/controller/jsonhttperror.php index ff8dbe55..cec32d0b 100644 --- a/controller/jsonhttperror.php +++ b/controller/jsonhttperror.php @@ -45,7 +45,7 @@ trait JsonHttpError { ) { $code = Http::STATUS_NOT_FOUND; } - if ($exception instanceof ForbiddenServiceException){ + if ($exception instanceof ForbiddenServiceException) { $code = Http::STATUS_FORBIDDEN; } diff --git a/controller/previewcontroller.php b/controller/previewcontroller.php index 90acdff9..2b16091b 100644 --- a/controller/previewcontroller.php +++ b/controller/previewcontroller.php @@ -118,9 +118,9 @@ class PreviewController extends Controller { * * @param string $ids the ID of the files of which we need thumbnail previews of * @param bool $square - * @param bool $scale + * @param double $scale * - * @return array<string,array|string> + * @return array<string,array|string|null> */ public function getThumbnails($ids, $square, $scale) { $idsArray = explode(';', $ids); @@ -182,7 +182,7 @@ class PreviewController extends Controller { * * @param int $fileId the ID of the file of which we need a thumbnail preview of * @param bool $square whether the thumbnail should be square - * @param bool $scale whether we're allowed to scale the preview up + * @param double $scale whether we're allowed to scale the preview up * * @return array<string,array|string> */ @@ -302,7 +302,7 @@ class PreviewController extends Controller { * * @param $status * - * @return array<null,int,string> + * @return array<null|int|string> */ private function getErrorData($status) { return [null, $status, 'error']; @@ -313,7 +313,7 @@ class PreviewController extends Controller { * * @param $exception * - * @return array<null,int,string> + * @return array<null|int|string> */ private function getExceptionData($exception) { if ($exception instanceof NotFoundServiceException) { |