diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 51d0719..7dd41af 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -29,8 +29,8 @@ class Navigation /** * Install navigation providing * - * @param string $path Module path - * @param ApplicationAbstract $app Application + * @param string $path Module path + * @param ApplicationAbstract $app Application * * @return void * diff --git a/Controller/ApiController.php b/Controller/ApiController.php index c9afe0b..e86f7a9 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -15,11 +15,16 @@ declare(strict_types=1); namespace Modules\QA\Controller; use Modules\Admin\Models\NullAccount; +use Modules\Profile\Models\Profile; +use Modules\QA\Models\NullQAAnswerVote; use Modules\QA\Models\NullQACategory; use Modules\QA\Models\NullQAQuestion; +use Modules\QA\Models\NullQAQuestionVote; use Modules\QA\Models\QAAnswer; use Modules\QA\Models\QAAnswerMapper; use Modules\QA\Models\QAAnswerStatus; +use Modules\QA\Models\QAAnswerVote; +use Modules\QA\Models\QAAnswerVoteMapper; use Modules\QA\Models\QACategory; use Modules\QA\Models\QACategoryL11n; use Modules\QA\Models\QACategoryL11nMapper; @@ -29,12 +34,7 @@ use Modules\QA\Models\QAQuestionMapper; use Modules\QA\Models\QAQuestionStatus; use Modules\QA\Models\QAQuestionVote; use Modules\QA\Models\QAQuestionVoteMapper; -use Modules\QA\Models\QAAnswerVote; -use Modules\QA\Models\QAAnswerVoteMapper; -use Modules\QA\Models\NullQAQuestionVote; -use Modules\QA\Models\NullQAAnswerVote; use Modules\Tag\Models\NullTag; -use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\NotificationLevel; @@ -42,7 +42,6 @@ use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; use phpOMS\Utils\Parser\Markdown\Markdown; -use Modules\Profile\Models\Profile; /** * Task class. @@ -311,7 +310,7 @@ final class ApiController extends Controller */ public function updateAnsweredStatusFromRequest(RequestAbstract $request) : QAAnswer { - $answer = QAAnswerMapper::get((int) $request->getData('id')); + $answer = QAAnswerMapper::get((int) $request->getData('id')); $answer->isAccepted = $request->getData('accepted', 'bool') ?? false; return $answer; @@ -481,15 +480,15 @@ final class ApiController extends Controller $questionVote = QAQuestionVoteMapper::findVote((int) $request->getData('id'), $request->header->account); if ($questionVote === false || $questionVote instanceof NullQAQuestionVote || $questionVote === null) { - $new = new QAQuestionVote(); - $new->score = (int) $request->getData('type'); - $new->question = (int) $request->getData('id'); + $new = new QAQuestionVote(); + $new->score = (int) $request->getData('type'); + $new->question = (int) $request->getData('id'); $new->createdBy = new NullAccount($request->header->account); $this->createModel($request->header->account, $new, QAQuestionVoteMapper::class, 'qa_question_vote', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Vote', 'Sucessfully voted.', $new); } else { - $new = clone $questionVote; + $new = clone $questionVote; $new->score = (int) $request->getData('type'); $this->updateModel($request->header->account, $questionVote, $new, QAQuestionVoteMapper::class, 'qa_question_vote', $request->getOrigin()); @@ -543,15 +542,15 @@ final class ApiController extends Controller $answerVote = QAAnswerVoteMapper::findVote((int) $request->getData('id'), $request->header->account); if ($answerVote === false || $answerVote instanceof NullQAAnswerVote || $answerVote === null) { - $new = new QAAnswerVote(); - $new->score = (int) $request->getData('type'); - $new->answer = (int) $request->getData('id'); + $new = new QAAnswerVote(); + $new->score = (int) $request->getData('type'); + $new->answer = (int) $request->getData('id'); $new->createdBy = new NullAccount($request->header->account); $this->createModel($request->header->account, $new, QAAnswerVoteMapper::class, 'qa_answer_vote', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Vote', 'Sucessfully voted.', $new); } else { - $new = clone $answerVote; + $new = clone $answerVote; $new->score = (int) $request->getData('type'); $this->updateModel($request->header->account, $answerVote, $new, QAAnswerVoteMapper::class, 'qa_answer_vote', $request->getOrigin()); diff --git a/Models/QAAnswerMapper.php b/Models/QAAnswerMapper.php index 0fc5d4e..e4218fc 100755 --- a/Models/QAAnswerMapper.php +++ b/Models/QAAnswerMapper.php @@ -54,7 +54,7 @@ final class QAAnswerMapper extends DataMapperAbstract 'createdBy' => [ 'mapper' => ProfileMapper::class, 'external' => 'qa_answer_created_by', - 'by' => 'account' + 'by' => 'account', ], 'question' => [ 'mapper' => QAQuestionMapper::class, diff --git a/Models/QAAnswerVoteMapper.php b/Models/QAAnswerVoteMapper.php index e853f8b..afcb965 100644 --- a/Models/QAAnswerVoteMapper.php +++ b/Models/QAAnswerVoteMapper.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Modules\QA\Models; -use phpOMS\DataStorage\Database\DataMapperAbstract; use Modules\Admin\Models\AccountMapper; +use phpOMS\DataStorage\Database\DataMapperAbstract; /** * Mapper class. @@ -35,8 +35,8 @@ final class QAAnswerVoteMapper extends DataMapperAbstract */ protected static array $columns = [ 'qa_answer_vote_id' => ['name' => 'qa_answer_vote_id', 'type' => 'int', 'internal' => 'id'], - 'qa_answer_vote_score' => ['name' => 'qa_answer_vote_score', 'type' => 'int', 'internal' => 'score'], - 'qa_answer_vote_answer' => ['name' => 'qa_answer_vote_answer', 'type' => 'int', 'internal' => 'answer', 'readonly' => true], + 'qa_answer_vote_score' => ['name' => 'qa_answer_vote_score', 'type' => 'int', 'internal' => 'score'], + 'qa_answer_vote_answer' => ['name' => 'qa_answer_vote_answer', 'type' => 'int', 'internal' => 'answer', 'readonly' => true], 'qa_answer_vote_created_by' => ['name' => 'qa_answer_vote_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], 'qa_answer_vote_created_at' => ['name' => 'qa_answer_vote_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], ]; diff --git a/Models/QAQuestion.php b/Models/QAQuestion.php index 014dc23..5a4b62a 100755 --- a/Models/QAQuestion.php +++ b/Models/QAQuestion.php @@ -15,8 +15,8 @@ declare(strict_types=1); namespace Modules\QA\Models; use Modules\Profile\Models\NullProfile; -use Modules\Tag\Models\Tag; use Modules\Profile\Models\Profile; +use Modules\Tag\Models\Tag; /** * Task class. diff --git a/Models/QAQuestionMapper.php b/Models/QAQuestionMapper.php index a1e147e..1ce671a 100755 --- a/Models/QAQuestionMapper.php +++ b/Models/QAQuestionMapper.php @@ -94,9 +94,9 @@ final class QAQuestionMapper extends DataMapperAbstract */ protected static array $belongsTo = [ 'createdBy' => [ - 'mapper' => ProfileMapper::class, + 'mapper' => ProfileMapper::class, 'external' => 'qa_question_created_by', - 'by' => 'account' + 'by' => 'account', ], ]; diff --git a/Models/QAQuestionVoteMapper.php b/Models/QAQuestionVoteMapper.php index 054f98e..0e61014 100644 --- a/Models/QAQuestionVoteMapper.php +++ b/Models/QAQuestionVoteMapper.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Modules\QA\Models; -use phpOMS\DataStorage\Database\DataMapperAbstract; use Modules\Admin\Models\AccountMapper; +use phpOMS\DataStorage\Database\DataMapperAbstract; /** * Mapper class. @@ -35,8 +35,8 @@ final class QAQuestionVoteMapper extends DataMapperAbstract */ protected static array $columns = [ 'qa_question_vote_id' => ['name' => 'qa_question_vote_id', 'type' => 'int', 'internal' => 'id'], - 'qa_question_vote_score' => ['name' => 'qa_question_vote_score', 'type' => 'int', 'internal' => 'score'], - 'qa_question_vote_question' => ['name' => 'qa_question_vote_question', 'type' => 'int', 'internal' => 'question', 'readonly' => true], + 'qa_question_vote_score' => ['name' => 'qa_question_vote_score', 'type' => 'int', 'internal' => 'score'], + 'qa_question_vote_question' => ['name' => 'qa_question_vote_question', 'type' => 'int', 'internal' => 'question', 'readonly' => true], 'qa_question_vote_created_by' => ['name' => 'qa_question_vote_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], 'qa_question_vote_created_at' => ['name' => 'qa_question_vote_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], ]; diff --git a/Theme/Backend/qa-dashboard.tpl.php b/Theme/Backend/qa-dashboard.tpl.php index 1d0328e..790a046 100755 --- a/Theme/Backend/qa-dashboard.tpl.php +++ b/Theme/Backend/qa-dashboard.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -use phpOMS\Uri\UriFactory; use Modules\Media\Models\NullMedia; +use phpOMS\Uri\UriFactory; $questions = $this->getData('questions'); echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/qa-question.tpl.php b/Theme/Backend/qa-question.tpl.php index 079a08a..c8dd999 100755 --- a/Theme/Backend/qa-question.tpl.php +++ b/Theme/Backend/qa-question.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -use phpOMS\Uri\UriFactory; use Modules\Media\Models\NullMedia; +use phpOMS\Uri\UriFactory; /** \Modules\QA\Models\QAQuestion $question */ $question = $this->getData('question');