Jingga/oms-QA
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-QA.git synced 2026-02-17 16:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

autofixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-24 18:44:22 +01:00
parent 949593c2e0
commit 10bdd816d1
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Controller/ApiController.php
View File

@ -14,28 +14,28 @@ declare(strict_types=1);
namespace Modules\QA\Controller; namespace Modules\QA\Controller;
use Modules\Admin\Models\NullAccount;
use Modules\QA\Models\NullQACategory; use Modules\QA\Models\NullQACategory;
use Modules\QA\Models\NullQAQuestion; use Modules\QA\Models\NullQAQuestion;
use Modules\QA\Models\QAAnswer; use Modules\QA\Models\QAAnswer;
use Modules\QA\Models\QAAnswerMapper; use Modules\QA\Models\QAAnswerMapper;
use Modules\QA\Models\QAAnswerStatus; use Modules\QA\Models\QAAnswerStatus;
use Modules\QA\Models\QACategory; use Modules\QA\Models\QACategory;
use Modules\QA\Models\QACategoryL11n;
use Modules\QA\Models\QACategoryL11nMapper;
use Modules\QA\Models\QACategoryMapper; use Modules\QA\Models\QACategoryMapper;
use Modules\QA\Models\QAQuestion; use Modules\QA\Models\QAQuestion;
use Modules\QA\Models\QAQuestionMapper; use Modules\QA\Models\QAQuestionMapper;
use Modules\QA\Models\QAQuestionStatus; 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\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\Utils\Parser\Markdown\Markdown; 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. * Task class.
@ -96,8 +96,8 @@ final class ApiController extends Controller
{ {
$mardkownParser = new Markdown(); $mardkownParser = new Markdown();
$question = new QAQuestion(); $question = new QAQuestion();
$question->name = (string) $request->getData('title'); $question->name = (string) $request->getData('title');
$question->question = (string) $request->getData('plain'); $question->question = (string) $request->getData('plain');
$question->setLanguage((string) $request->getData('language')); $question->setLanguage((string) $request->getData('language'));
$question->setCategory(new NullQACategory((int) $request->getData('category'))); $question->setCategory(new NullQACategory((int) $request->getData('category')));
@ -190,8 +190,8 @@ final class ApiController extends Controller
{ {
$mardkownParser = new Markdown(); $mardkownParser = new Markdown();
$answer = new QAAnswer(); $answer = new QAAnswer();
$answer->answer = (string) $request->getData('plain'); $answer->answer = (string) $request->getData('plain');
$answer->question = new NullQAQuestion((int) $request->getData('question')); $answer->question = new NullQAQuestion((int) $request->getData('question'));
$answer->setStatus((int) $request->getData('status')); $answer->setStatus((int) $request->getData('status'));
$answer->createdBy = new NullAccount($request->header->account); $answer->createdBy = new NullAccount($request->header->account);

2
Models/QACategory.php
View File

@ -100,7 +100,7 @@ class QACategory implements \JsonSerializable
} elseif ($this->name instanceof QACategoryL11n && \is_string($name)) { } elseif ($this->name instanceof QACategoryL11n && \is_string($name)) {
$this->name->name = $name; $this->name->name = $name;
} elseif (\is_string($name)) { } elseif (\is_string($name)) {
$this->name = new QACategoryL11n(); $this->name = new QACategoryL11n();
$this->name->name = $name; $this->name->name = $name;
$this->name->setLanguage($lang); $this->name->setLanguage($lang);
} }

6
Models/QACategoryL11n.php
View File

@ -154,10 +154,10 @@ class QACategoryL11n implements \JsonSerializable, ArrayableInterface
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'name' => $this->name, 'name' => $this->name,
'category' => $this->category, 'category' => $this->category,
'language' => $this->language, 'language' => $this->language,
]; ];
} }

6
Models/QACategoryL11nMapper.php
View File

@ -36,10 +36,10 @@ final class QACategoryL11nMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $columns = [ protected static array $columns = [
'qa_category_l11n_id' => ['name' => 'qa_category_l11n_id', 'type' => 'int', 'internal' => 'id'], '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_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_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'],
]; ];
/** /**

2
Models/QAQuestionMapper.php
View File

@ -15,8 +15,8 @@ declare(strict_types=1);
namespace Modules\QA\Models; namespace Modules\QA\Models;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use phpOMS\DataStorage\Database\DataMapperAbstract;
use Modules\Tag\Models\TagMapper; use Modules\Tag\Models\TagMapper;
use phpOMS\DataStorage\Database\DataMapperAbstract;
/** /**
* Mapper class. * Mapper class.

4
tests/Models/3QAQuestionMapperTest.php
View File

@ -34,7 +34,7 @@ class QAQuestionMapperTest extends \PHPUnit\Framework\TestCase
{ {
$question = new QAQuestion(); $question = new QAQuestion();
$question->name = 'Question Name'; $question->name = 'Question Name';
$question->question = 'Question content'; $question->question = 'Question content';
$question->setStatus(QAQuestionStatus::ACTIVE); $question->setStatus(QAQuestionStatus::ACTIVE);
$question->setCategory(new NullQACategory(1)); $question->setCategory(new NullQACategory(1));
@ -65,7 +65,7 @@ class QAQuestionMapperTest extends \PHPUnit\Framework\TestCase
$text = new Text(); $text = new Text();
$question = new QAQuestion(); $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->question = $text->generateText(\mt_rand(100, 500));
$question->setStatus(QAQuestionStatus::ACTIVE); $question->setStatus(QAQuestionStatus::ACTIVE);
$question->setCategory(new NullQACategory(\mt_rand(1, 9))); $question->setCategory(new NullQACategory(\mt_rand(1, 9)));

2
tests/Models/QAQuestionTest.php
View File

@ -51,7 +51,7 @@ class QAQuestionTest extends \PHPUnit\Framework\TestCase
{ {
$question = new QAQuestion(); $question = new QAQuestion();
$question->name = 'Question Name'; $question->name = 'Question Name';
$question->question = 'Question content'; $question->question = 'Question content';
$question->setStatus(QAQuestionStatus::ACTIVE); $question->setStatus(QAQuestionStatus::ACTIVE);
$question->setCategory(new NullQACategory(1)); $question->setCategory(new NullQACategory(1));