From 2d2104288bd5439c0ec16f38e7ad43c62b7c0dec Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 28 Sep 2023 01:33:30 +0000 Subject: [PATCH] use getDataArray --- Admin/Installer.php | 4 ++-- Controller/ApiController.php | 2 +- Models/MediaMapper.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 33addb7..f0f5269 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -360,9 +360,9 @@ final class Installer extends InstallerAbstract $module->apiMediaUpload($request, $response); - $uploadedIds = $response->get('')['response']; + $uploadedIds = $response->getDataArray('')['response']; - if ($data['create_collection']) { + if ($data['create_collection'] ?? false) { $response = new HttpResponse(); $request = new HttpRequest(new HttpUri('')); diff --git a/Controller/ApiController.php b/Controller/ApiController.php index f592511..1b90e28 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -1088,7 +1088,7 @@ final class ApiController extends Controller } if ($media->hasPassword() - && !$media->comparePassword($request->getDataString('password')) + && !$media->comparePassword($request->getDataString('password') ?? '') ) { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Media/Theme/Api/invalidPassword'); diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php index 9dcc742..81ca682 100755 --- a/Models/MediaMapper.php +++ b/Models/MediaMapper.php @@ -222,8 +222,8 @@ class MediaMapper extends DataMapperFactory $result = $query->count(self::TABLE) ->where('media_relation_src', '=', $id) ->execute() - ?->fetch(); + ?->fetch() ?? []; - return $references + ((int) $result[0] ?? 0); + return $references + ((int) ($result[0] ?? 0)); } }