From 10bdd816d12da46a618e228c58708a050b03b456 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 24 Nov 2020 18:44:22 +0100 Subject: [PATCH] autofixes --- Controller/ApiController.php | 22 +++++++++++----------- Models/QACategory.php | 2 +- Models/QACategoryL11n.php | 6 +++--- Models/QACategoryL11nMapper.php | 6 +++--- Models/QAQuestionMapper.php | 2 +- tests/Models/3QAQuestionMapperTest.php | 4 ++-- tests/Models/QAQuestionTest.php | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 39f950c..673b5d8 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,28 +14,28 @@ declare(strict_types=1); namespace Modules\QA\Controller; +use Modules\Admin\Models\NullAccount; use Modules\QA\Models\NullQACategory; use Modules\QA\Models\NullQAQuestion; use Modules\QA\Models\QAAnswer; use Modules\QA\Models\QAAnswerMapper; use Modules\QA\Models\QAAnswerStatus; use Modules\QA\Models\QACategory; +use Modules\QA\Models\QACategoryL11n; +use Modules\QA\Models\QACategoryL11nMapper; use Modules\QA\Models\QACategoryMapper; use Modules\QA\Models\QAQuestion; use Modules\QA\Models\QAQuestionMapper; use Modules\QA\Models\QAQuestionStatus; +use Modules\Tag\Models\NullTag; +use phpOMS\Message\Http\HttpRequest; +use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestStatusCode; +use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; use phpOMS\Utils\Parser\Markdown\Markdown; -use phpOMS\Message\Http\HttpRequest; -use phpOMS\Message\NotificationLevel; -use Modules\QA\Models\QACategoryL11n; -use Modules\Tag\Models\NullTag; -use phpOMS\Message\Http\HttpResponse; -use Modules\Admin\Models\NullAccount; -use Modules\QA\Models\QACategoryL11nMapper; /** * Task class. @@ -96,8 +96,8 @@ final class ApiController extends Controller { $mardkownParser = new Markdown(); - $question = new QAQuestion(); - $question->name = (string) $request->getData('title'); + $question = new QAQuestion(); + $question->name = (string) $request->getData('title'); $question->question = (string) $request->getData('plain'); $question->setLanguage((string) $request->getData('language')); $question->setCategory(new NullQACategory((int) $request->getData('category'))); @@ -190,8 +190,8 @@ final class ApiController extends Controller { $mardkownParser = new Markdown(); - $answer = new QAAnswer(); - $answer->answer = (string) $request->getData('plain'); + $answer = new QAAnswer(); + $answer->answer = (string) $request->getData('plain'); $answer->question = new NullQAQuestion((int) $request->getData('question')); $answer->setStatus((int) $request->getData('status')); $answer->createdBy = new NullAccount($request->header->account); diff --git a/Models/QACategory.php b/Models/QACategory.php index 7a66b6e..558e78c 100755 --- a/Models/QACategory.php +++ b/Models/QACategory.php @@ -100,7 +100,7 @@ class QACategory implements \JsonSerializable } elseif ($this->name instanceof QACategoryL11n && \is_string($name)) { $this->name->name = $name; } elseif (\is_string($name)) { - $this->name = new QACategoryL11n(); + $this->name = new QACategoryL11n(); $this->name->name = $name; $this->name->setLanguage($lang); } diff --git a/Models/QACategoryL11n.php b/Models/QACategoryL11n.php index 1a09750..3f2038b 100644 --- a/Models/QACategoryL11n.php +++ b/Models/QACategoryL11n.php @@ -154,10 +154,10 @@ class QACategoryL11n implements \JsonSerializable, ArrayableInterface public function toArray() : array { return [ - 'id' => $this->id, - 'name' => $this->name, + 'id' => $this->id, + 'name' => $this->name, 'category' => $this->category, - 'language' => $this->language, + 'language' => $this->language, ]; } diff --git a/Models/QACategoryL11nMapper.php b/Models/QACategoryL11nMapper.php index 1dc5d7c..808070b 100644 --- a/Models/QACategoryL11nMapper.php +++ b/Models/QACategoryL11nMapper.php @@ -36,10 +36,10 @@ final class QACategoryL11nMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'qa_category_l11n_id' => ['name' => 'qa_category_l11n_id', 'type' => 'int', 'internal' => 'id'], - 'qa_category_l11n_name' => ['name' => 'qa_category_l11n_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], + 'qa_category_l11n_id' => ['name' => 'qa_category_l11n_id', 'type' => 'int', 'internal' => 'id'], + 'qa_category_l11n_name' => ['name' => 'qa_category_l11n_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], 'qa_category_l11n_category' => ['name' => 'qa_category_l11n_category', 'type' => 'int', 'internal' => 'category'], - 'qa_category_l11n_language' => ['name' => 'qa_category_l11n_language', 'type' => 'string', 'internal' => 'language'], + 'qa_category_l11n_language' => ['name' => 'qa_category_l11n_language', 'type' => 'string', 'internal' => 'language'], ]; /** diff --git a/Models/QAQuestionMapper.php b/Models/QAQuestionMapper.php index 9a4f698..deb2130 100755 --- a/Models/QAQuestionMapper.php +++ b/Models/QAQuestionMapper.php @@ -15,8 +15,8 @@ declare(strict_types=1); namespace Modules\QA\Models; use Modules\Admin\Models\AccountMapper; -use phpOMS\DataStorage\Database\DataMapperAbstract; use Modules\Tag\Models\TagMapper; +use phpOMS\DataStorage\Database\DataMapperAbstract; /** * Mapper class. diff --git a/tests/Models/3QAQuestionMapperTest.php b/tests/Models/3QAQuestionMapperTest.php index d5b4570..538e349 100755 --- a/tests/Models/3QAQuestionMapperTest.php +++ b/tests/Models/3QAQuestionMapperTest.php @@ -34,7 +34,7 @@ class QAQuestionMapperTest extends \PHPUnit\Framework\TestCase { $question = new QAQuestion(); - $question->name = 'Question Name'; + $question->name = 'Question Name'; $question->question = 'Question content'; $question->setStatus(QAQuestionStatus::ACTIVE); $question->setCategory(new NullQACategory(1)); @@ -65,7 +65,7 @@ class QAQuestionMapperTest extends \PHPUnit\Framework\TestCase $text = new Text(); $question = new QAQuestion(); - $question->name = $text->generateText(\mt_rand(1, 3)); + $question->name = $text->generateText(\mt_rand(1, 3)); $question->question = $text->generateText(\mt_rand(100, 500)); $question->setStatus(QAQuestionStatus::ACTIVE); $question->setCategory(new NullQACategory(\mt_rand(1, 9))); diff --git a/tests/Models/QAQuestionTest.php b/tests/Models/QAQuestionTest.php index 3560525..ac1994e 100755 --- a/tests/Models/QAQuestionTest.php +++ b/tests/Models/QAQuestionTest.php @@ -51,7 +51,7 @@ class QAQuestionTest extends \PHPUnit\Framework\TestCase { $question = new QAQuestion(); - $question->name = 'Question Name'; + $question->name = 'Question Name'; $question->question = 'Question content'; $question->setStatus(QAQuestionStatus::ACTIVE); $question->setCategory(new NullQACategory(1));