From 6d1ae183cb387b06b0ad2ee7ea6961c8c00b00fe Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 4 Feb 2024 20:34:12 +0000 Subject: [PATCH] update --- Controller/ApiController.php | 18 ++++++++---------- Models/QAHelperMapper.php | 8 ++------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 054d877..514b21b 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -154,7 +154,7 @@ final class ApiController extends Controller } if (!empty($uploadedFiles = $request->files)) { - $uploaded = $this->app->moduleManager->get('Media')->uploadFiles( + $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( [], [], $uploadedFiles, @@ -168,10 +168,9 @@ final class ApiController extends Controller } } - if (!empty($mediaFiles = $request->getDataJson('media'))) { - foreach ($mediaFiles as $media) { - $question->files[] = new NullMedia($media); - } + $mediaFiles = $request->getDataJson('media'); + foreach ($mediaFiles as $media) { + $question->files[] = new NullMedia($media); } return $question; @@ -250,7 +249,7 @@ final class ApiController extends Controller $answer->createdBy = new Profile(new NullAccount($request->header->account)); if (!empty($uploadedFiles = $request->files)) { - $uploaded = $this->app->moduleManager->get('Media')->uploadFiles( + $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( [], [], $uploadedFiles, @@ -264,10 +263,9 @@ final class ApiController extends Controller } } - if (!empty($mediaFiles = $request->getDataJson('media'))) { - foreach ($mediaFiles as $media) { - $answer->files[] = new NullMedia($media); - } + $mediaFiles = $request->getDataJson('media'); + foreach ($mediaFiles as $media) { + $answer->files[] = new NullMedia($media); } return $answer; diff --git a/Models/QAHelperMapper.php b/Models/QAHelperMapper.php index f33bd4a..15d3ca1 100755 --- a/Models/QAHelperMapper.php +++ b/Models/QAHelperMapper.php @@ -50,9 +50,7 @@ final class QAHelperMapper extends DataMapperFactory ->execute() ?->fetchAll(); - if ($questionScore === null) { - $questionScore = []; - } + $questionScore ??= []; foreach ($questionScore as $votes) { $scores[(int) $votes['qa_question_vote_created_for']] = (int) $votes['score']; @@ -67,9 +65,7 @@ final class QAHelperMapper extends DataMapperFactory ->execute() ?->fetchAll(); - if ($answerScore === null) { - $answerScore = []; - } + $answerScore ??= []; foreach ($answerScore as $votes) { $scores[(int) $votes['qa_answer_vote_created_for']] ??= 0;