From 4bce325386569b6b20e020cda7343737aa92fba6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 24 Nov 2020 18:44:22 +0100 Subject: [PATCH] autofixes --- Admin/Installer.php | 4 ++-- Controller/ApiController.php | 16 ++++++++-------- Models/WikiCategory.php | 4 ++-- Models/WikiCategoryL11n.php | 6 +++--- Models/WikiCategoryL11nMapper.php | 6 +++--- Models/WikiCategoryMapper.php | 10 +++++----- Models/WikiDocMapper.php | 16 ++++++++-------- tests/Models/WikiDocMapperTest.php | 4 ++-- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 8f6d77d..76913c5 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -42,7 +42,7 @@ final class Installer extends InstallerAbstract { parent::install($dbPool, $info, $cfgHandler); - $app = new WikiApp(); + $app = new WikiApp(); $app->name = 'Default'; $id = WikiAppMapper::create($app); @@ -56,7 +56,7 @@ final class Installer extends InstallerAbstract // @todo: create hook for when a new unit is created $units = UnitMapper::getAll(); foreach ($units as $unit) { - $app = new WikiApp(); + $app = new WikiApp(); $app->name = $unit->name; $id = WikiAppMapper::create($app); diff --git a/Controller/ApiController.php b/Controller/ApiController.php index f0eb72d..a5d7eb0 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,15 +14,19 @@ declare(strict_types=1); namespace Modules\Knowledgebase\Controller; +use Modules\Knowledgebase\Models\NullWikiApp; use Modules\Knowledgebase\Models\NullWikiCategory; use Modules\Knowledgebase\Models\WikiApp; use Modules\Knowledgebase\Models\WikiAppMapper; use Modules\Knowledgebase\Models\WikiCategory; +use Modules\Knowledgebase\Models\WikiCategoryL11n; +use Modules\Knowledgebase\Models\WikiCategoryL11nMapper; use Modules\Knowledgebase\Models\WikiCategoryMapper; use Modules\Knowledgebase\Models\WikiDoc; use Modules\Knowledgebase\Models\WikiDocMapper; use Modules\Knowledgebase\Models\WikiStatus; use Modules\Tag\Models\NullTag; +use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\NotificationLevel; @@ -30,10 +34,6 @@ use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; use phpOMS\Utils\Parser\Markdown\Markdown; -use Modules\Knowledgebase\Models\WikiCategoryL11n; -use phpOMS\Message\Http\HttpRequest; -use Modules\Knowledgebase\Models\WikiCategoryL11nMapper; -use Modules\Knowledgebase\Models\NullWikiApp; /** * Knowledgebase class. @@ -89,9 +89,9 @@ final class ApiController extends Controller */ public function createWikiDocFromRequest(RequestAbstract $request, ResponseAbstract $response, $data = null) : WikiDoc { - $doc = new WikiDoc(); - $doc->name = (string) $request->getData('title'); - $doc->doc = Markdown::parse((string) ($request->getData('plain') ?? '')); + $doc = new WikiDoc(); + $doc->name = (string) $request->getData('title'); + $doc->doc = Markdown::parse((string) ($request->getData('plain') ?? '')); $doc->docRaw = (string) ($request->getData('plain') ?? ''); $doc->setCategory(new NullWikiCategory((int) ($request->getData('category') ?? 1))); $doc->setLanguage((string) ($request->getData('language') ?? $request->getLanguage())); @@ -481,7 +481,7 @@ final class ApiController extends Controller */ public function createWikiAppFromRequest(RequestAbstract $request) : WikiApp { - $app = new WikiApp(); + $app = new WikiApp(); $app->name = (string) $request->getData('name'); return $app; diff --git a/Models/WikiCategory.php b/Models/WikiCategory.php index fbcca70..94792fe 100755 --- a/Models/WikiCategory.php +++ b/Models/WikiCategory.php @@ -75,7 +75,7 @@ class WikiCategory implements \JsonSerializable */ public function __construct() { - $this->app = new NullWikiApp(); + $this->app = new NullWikiApp(); $this->parent = new NullWikiCategory(); } @@ -145,7 +145,7 @@ class WikiCategory implements \JsonSerializable } elseif ($this->name instanceof WikiCategoryL11n && \is_string($name)) { $this->name->name = $name; } elseif (\is_string($name)) { - $this->name = new WikiCategoryL11n(); + $this->name = new WikiCategoryL11n(); $this->name->name = $name; $this->name->setLanguage($lang); } diff --git a/Models/WikiCategoryL11n.php b/Models/WikiCategoryL11n.php index f1da13d..e694f45 100644 --- a/Models/WikiCategoryL11n.php +++ b/Models/WikiCategoryL11n.php @@ -154,10 +154,10 @@ class WikiCategoryL11n 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/WikiCategoryL11nMapper.php b/Models/WikiCategoryL11nMapper.php index f1c7b08..01e9c5e 100644 --- a/Models/WikiCategoryL11nMapper.php +++ b/Models/WikiCategoryL11nMapper.php @@ -36,10 +36,10 @@ final class WikiCategoryL11nMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'wiki_category_l11n_id' => ['name' => 'wiki_category_l11n_id', 'type' => 'int', 'internal' => 'id'], - 'wiki_category_l11n_name' => ['name' => 'wiki_category_l11n_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], + 'wiki_category_l11n_id' => ['name' => 'wiki_category_l11n_id', 'type' => 'int', 'internal' => 'id'], + 'wiki_category_l11n_name' => ['name' => 'wiki_category_l11n_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], 'wiki_category_l11n_category' => ['name' => 'wiki_category_l11n_category', 'type' => 'int', 'internal' => 'category'], - 'wiki_category_l11n_language' => ['name' => 'wiki_category_l11n_language', 'type' => 'string', 'internal' => 'language'], + 'wiki_category_l11n_language' => ['name' => 'wiki_category_l11n_language', 'type' => 'string', 'internal' => 'language'], ]; /** diff --git a/Models/WikiCategoryMapper.php b/Models/WikiCategoryMapper.php index 267a0bc..0dd0dd3 100755 --- a/Models/WikiCategoryMapper.php +++ b/Models/WikiCategoryMapper.php @@ -34,10 +34,10 @@ final class WikiCategoryMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'wiki_category_id' => ['name' => 'wiki_category_id', 'type' => 'int', 'internal' => 'id'], - 'wiki_category_app' => ['name' => 'wiki_category_app', 'type' => 'int', 'internal' => 'app'], + 'wiki_category_id' => ['name' => 'wiki_category_id', 'type' => 'int', 'internal' => 'id'], + 'wiki_category_app' => ['name' => 'wiki_category_app', 'type' => 'int', 'internal' => 'app'], 'wiki_category_virtual' => ['name' => 'wiki_category_virtual', 'type' => 'string', 'internal' => 'virtualPath'], - 'wiki_category_parent' => ['name' => 'wiki_category_parent', 'type' => 'int', 'internal' => 'parent'], + 'wiki_category_parent' => ['name' => 'wiki_category_parent', 'type' => 'int', 'internal' => 'parent'], ]; /** @@ -121,8 +121,8 @@ final class WikiCategoryMapper extends DataMapperAbstract /** * Get by app. * - * @param int $app App - * @param int $depth Relation depth + * @param int $app App + * @param int $depth Relation depth * * @return array * diff --git a/Models/WikiDocMapper.php b/Models/WikiDocMapper.php index 6a105ef..0e8ab69 100755 --- a/Models/WikiDocMapper.php +++ b/Models/WikiDocMapper.php @@ -16,8 +16,8 @@ namespace Modules\Knowledgebase\Models; use Modules\Tag\Models\TagMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; -use phpOMS\DataStorage\Database\RelationType; use phpOMS\DataStorage\Database\Query\Builder; +use phpOMS\DataStorage\Database\RelationType; /** * Mapper class. @@ -36,14 +36,14 @@ final class WikiDocMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'wiki_article_id' => ['name' => 'wiki_article_id', 'type' => 'int', 'internal' => 'id'], - 'wiki_article_app' => ['name' => 'wiki_article_app', 'type' => 'int', 'internal' => 'app'], - 'wiki_article_title' => ['name' => 'wiki_article_title', 'type' => 'string', 'internal' => 'name'], - 'wiki_article_language' => ['name' => 'wiki_article_language', 'type' => 'string', 'internal' => 'language'], - 'wiki_article_doc' => ['name' => 'wiki_article_doc', 'type' => 'string', 'internal' => 'doc'], + 'wiki_article_id' => ['name' => 'wiki_article_id', 'type' => 'int', 'internal' => 'id'], + 'wiki_article_app' => ['name' => 'wiki_article_app', 'type' => 'int', 'internal' => 'app'], + 'wiki_article_title' => ['name' => 'wiki_article_title', 'type' => 'string', 'internal' => 'name'], + 'wiki_article_language' => ['name' => 'wiki_article_language', 'type' => 'string', 'internal' => 'language'], + 'wiki_article_doc' => ['name' => 'wiki_article_doc', 'type' => 'string', 'internal' => 'doc'], 'wiki_article_docraw' => ['name' => 'wiki_article_docraw', 'type' => 'string', 'internal' => 'docRaw'], - 'wiki_article_status' => ['name' => 'wiki_article_status', 'type' => 'int', 'internal' => 'status'], - 'wiki_article_category' => ['name' => 'wiki_article_category', 'type' => 'int', 'internal' => 'category'], + 'wiki_article_status' => ['name' => 'wiki_article_status', 'type' => 'int', 'internal' => 'status'], + 'wiki_article_category' => ['name' => 'wiki_article_category', 'type' => 'int', 'internal' => 'category'], ]; /** diff --git a/tests/Models/WikiDocMapperTest.php b/tests/Models/WikiDocMapperTest.php index 0f1d525..c833e2c 100755 --- a/tests/Models/WikiDocMapperTest.php +++ b/tests/Models/WikiDocMapperTest.php @@ -37,7 +37,7 @@ class WikiDocMapperTest extends \PHPUnit\Framework\TestCase $doc = new WikiDoc(); $doc->name = 'Doc Name'; - $doc->doc = 'Doc content'; + $doc->doc = 'Doc content'; $doc->setStatus(WikiStatus::DRAFT); $doc->setCategory(new NullWikiCategory(1)); $doc->setLanguage('en'); @@ -66,7 +66,7 @@ class WikiDocMapperTest extends \PHPUnit\Framework\TestCase $doc = new WikiDoc(); $doc->name = $text->generateText(\mt_rand(1, 3)); - $doc->doc = $text->generateText(\mt_rand(100, 500)); + $doc->doc = $text->generateText(\mt_rand(100, 500)); $doc->setStatus(WikiStatus::ACTIVE); $doc->setCategory(new NullWikiCategory(\mt_rand(1, 9))); $doc->setLanguage('en');