Jingga/oms-Editor
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Editor.git synced 2026-02-10 23:48:40 +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 89053c804c
commit bf076fa7c2
6 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Controller/ApiController.php
View File

@ -18,13 +18,13 @@ use Modules\Admin\Models\NullAccount;
use Modules\Editor\Models\EditorDoc; use Modules\Editor\Models\EditorDoc;
use Modules\Editor\Models\EditorDocMapper; use Modules\Editor\Models\EditorDocMapper;
use Modules\Tag\Models\NullTag; use Modules\Tag\Models\NullTag;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel; 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\HttpResponse;
/** /**
* Calendar controller class. * Calendar controller class.
@ -103,9 +103,9 @@ final class ApiController extends Controller
*/ */
private function createDocFromRequest(RequestAbstract $request) : EditorDoc private function createDocFromRequest(RequestAbstract $request) : EditorDoc
{ {
$doc = new EditorDoc(); $doc = new EditorDoc();
$doc->title = (string) ($request->getData('title') ?? ''); $doc->title = (string) ($request->getData('title') ?? '');
$doc->plaint = (string) ($request->getData('plain') ?? ''); $doc->plaint = (string) ($request->getData('plain') ?? '');
$doc->content = Markdown::parse((string) ($request->getData('plain') ?? '')); $doc->content = Markdown::parse((string) ($request->getData('plain') ?? ''));
$doc->setVirtualPath((string) ($request->getData('virtualpath') ?? '/')); $doc->setVirtualPath((string) ($request->getData('virtualpath') ?? '/'));
$doc->createdBy = new NullAccount($request->header->account); $doc->createdBy = new NullAccount($request->header->account);
@ -163,9 +163,9 @@ final class ApiController extends Controller
private function updateEditorFromRequest(RequestAbstract $request) : EditorDoc private function updateEditorFromRequest(RequestAbstract $request) : EditorDoc
{ {
/** @var \Modules\Editor\Models\EditorDoc $doc */ /** @var \Modules\Editor\Models\EditorDoc $doc */
$doc = EditorDocMapper::get((int) $request->getData('id')); $doc = EditorDocMapper::get((int) $request->getData('id'));
$doc->title = (string) ($request->getData('title') ?? $doc->title); $doc->title = (string) ($request->getData('title') ?? $doc->title);
$doc->plaint = (string) ($request->getData('plain') ?? $doc->plain); $doc->plaint = (string) ($request->getData('plain') ?? $doc->plain);
$doc->content = Markdown::parse((string) ($request->getData('plain') ?? $doc->plain)); $doc->content = Markdown::parse((string) ($request->getData('plain') ?? $doc->plain));
return $doc; return $doc;

2
Controller/BackendController.php
View File

@ -24,8 +24,6 @@ use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View; use phpOMS\Views\View;
use Modules\Media\Models\Collection;
use Modules\Admin\Models\Account;
/** /**
* Calendar controller class. * Calendar controller class.

12
Models/EditorDocMapper.php
View File

@ -36,13 +36,13 @@ final class EditorDocMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $columns = [ protected static array $columns = [
'editor_doc_id' => ['name' => 'editor_doc_id', 'type' => 'int', 'internal' => 'id'], 'editor_doc_id' => ['name' => 'editor_doc_id', 'type' => 'int', 'internal' => 'id'],
'editor_doc_created_by' => ['name' => 'editor_doc_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], 'editor_doc_created_by' => ['name' => 'editor_doc_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true],
'editor_doc_title' => ['name' => 'editor_doc_title', 'type' => 'string', 'internal' => 'title'], 'editor_doc_title' => ['name' => 'editor_doc_title', 'type' => 'string', 'internal' => 'title'],
'editor_doc_plain' => ['name' => 'editor_doc_plain', 'type' => 'string', 'internal' => 'plain'], 'editor_doc_plain' => ['name' => 'editor_doc_plain', 'type' => 'string', 'internal' => 'plain'],
'editor_doc_content' => ['name' => 'editor_doc_content', 'type' => 'string', 'internal' => 'content'], 'editor_doc_content' => ['name' => 'editor_doc_content', 'type' => 'string', 'internal' => 'content'],
'editor_doc_virtual' => ['name' => 'editor_doc_virtual', 'type' => 'string', 'internal' => 'virtualPath'], 'editor_doc_virtual' => ['name' => 'editor_doc_virtual', 'type' => 'string', 'internal' => 'virtualPath'],
'editor_doc_created_at' => ['name' => 'editor_doc_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], 'editor_doc_created_at' => ['name' => 'editor_doc_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
]; ];
/** /**

6
tests/Controller/ApiControllerTest.php
View File

@ -192,9 +192,9 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDeleteEditorDoc() : void public function testDeleteEditorDoc() : void
{ {
$doc = new EditorDoc(); $doc = new EditorDoc();
$doc->title = 'TestTitle'; $doc->title = 'TestTitle';
$doc->content = 'TestContent'; $doc->content = 'TestContent';
$doc->createdBy = new NullAccount(1); $doc->createdBy = new NullAccount(1);
$docId = EditorDocMapper::create($doc); $docId = EditorDocMapper::create($doc);

8
tests/Models/EditorDocMapperTest.php
View File

@ -33,8 +33,8 @@ class EditorDocMapperTest extends \PHPUnit\Framework\TestCase
$doc = new EditorDoc(); $doc = new EditorDoc();
$doc->createdBy = new NullAccount(1); $doc->createdBy = new NullAccount(1);
$doc->title = 'Title'; $doc->title = 'Title';
$doc->content = 'Content'; $doc->content = 'Content';
$doc->setVirtualPath('/some/test/path'); $doc->setVirtualPath('/some/test/path');
$id = EditorDocMapper::create($doc); $id = EditorDocMapper::create($doc);
@ -63,8 +63,8 @@ class EditorDocMapperTest extends \PHPUnit\Framework\TestCase
// Test other // Test other
$doc->createdBy = new NullAccount(\mt_rand(1, 1)); $doc->createdBy = new NullAccount(\mt_rand(1, 1));
$doc->title = $text->generateText(\mt_rand(3, 7)); $doc->title = $text->generateText(\mt_rand(3, 7));
$doc->content = $text->generateText(\mt_rand(20, 500)); $doc->content = $text->generateText(\mt_rand(20, 500));
$doc->setVirtualPath('/some/test/path'); $doc->setVirtualPath('/some/test/path');
$id = EditorDocMapper::create($doc); $id = EditorDocMapper::create($doc);

6
tests/Models/EditorDocTest.php
View File

@ -115,9 +115,9 @@ class EditorDocTest extends \PHPUnit\Framework\TestCase
public function testSerialization() : void public function testSerialization() : void
{ {
$this->doc->createdBy = new NullAccount(1); $this->doc->createdBy = new NullAccount(1);
$this->doc->title = 'Title'; $this->doc->title = 'Title';
$this->doc->content = 'Content'; $this->doc->content = 'Content';
$this->doc->plaint = 'Plain'; $this->doc->plaint = 'Plain';
$this->doc->setVirtualPath('/some/path'); $this->doc->setVirtualPath('/some/path');
$arr = [ $arr = [
'id' => 0, 'id' => 0,