Jingga/oms-Knowledgebase
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Knowledgebase.git synced 2026-01-26 08:18: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 0f67072e3e
commit 4bce325386
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Installer.php
View File

@ -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);

16
Controller/ApiController.php
View File

@ -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;

4
Models/WikiCategory.php
View File

@ -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);
}

6
Models/WikiCategoryL11n.php
View File

@ -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,
];
}

6
Models/WikiCategoryL11nMapper.php
View File

@ -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'],
];
/**

10
Models/WikiCategoryMapper.php
View File

@ -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
*

16
Models/WikiDocMapper.php
View File

@ -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'],
];
/**

4
tests/Models/WikiDocMapperTest.php
View File

@ -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');