phpstan and phpcs fixes

Admin/Install/Navigation.install.json

@@ -10,7 +10,7 @@
         "icon": null,
         "order": 75,
         "from": "Editor",
-        "permission": { "permission": 2, "type": null, "element": null },
+        "permission": { "permission": 2, "category": null, "element": null },
         "parent": 1003301001,
         "children": [
             {
@@ -24,7 +24,7 @@
                 "icon": null,
                 "order": 1,
                 "from": "Editor",
-                "permission": { "permission": 2, "type": null, "element": null },
+                "permission": { "permission": 2, "category": null, "element": null },
                 "parent": 1005301001,
                 "children": []
             },
@@ -39,7 +39,7 @@
                 "icon": null,
                 "order": 15,
                 "from": "Editor",
-                "permission": { "permission": 4, "type": null, "element": null },
+                "permission": { "permission": 4, "category": null, "element": null },
                 "parent": 1005301001,
                 "children": []
             }

Admin/Installer.php

@@ -15,12 +15,8 @@ declare(strict_types=1);
 namespace Modules\Editor\Admin;
 
 use Modules\Editor\Models\EditorDocType;
-use Modules\Editor\Models\EditorDocTypeL11n;
-use Modules\Editor\Models\EditorDocTypeL11nMapper;
-use Modules\Editor\Models\EditorDocTypeMapper;
 use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Config\SettingsInterface;
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Module\InstallerAbstract;

Controller/ApiController.php

@@ -102,7 +102,7 @@ final class ApiController extends Controller
      *
      * @param RequestAbstract $request Request
      *
-     * @return EditorDoc
+     * @return EditorDocType
      *
      * @since 1.0.0
      */
@@ -180,10 +180,10 @@ final class ApiController extends Controller
     {
         $l11nEditorDocType        = new EditorDocTypeL11n();
         $l11nEditorDocType->type  = (int) ($request->getData('type') ?? 0);
+        $l11nEditorDocType->title = (string) ($request->getData('title') ?? '');
         $l11nEditorDocType->setLanguage((string) (
             $request->getData('language') ?? $request->getLanguage()
         ));
-        $l11nEditorDocType->title = (string) ($request->getData('title') ?? '');
 
         return $l11nEditorDocType;
     }
@@ -248,6 +248,16 @@ final class ApiController extends Controller
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Document', 'Document successfully created', $doc);
     }
 
+    /**
+     * Create media files for editor document
+     *
+     * @param EditorDoc       $doc     Editor document
+     * @param RequestAbstract $request Request incl. media do upload
+     *
+     * @return void
+     *
+     * @since 1.0.0
+     */
     private function createDocMedia(EditorDoc $doc, RequestAbstract $request) : void
     {
         $path    = $this->createEditorDir($doc);
@@ -279,7 +289,6 @@ final class ApiController extends Controller
 
                 if ($collection === null) {
                     $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
-                        '/Modules/Media/Files',
                         $accountPath,
                         $request->header->account,
                         __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/Editor/' . $doc->createdAt->format('Y') . '/' . $doc->createdAt->format('m') . '/' . $doc->getId()
@@ -305,7 +314,6 @@ final class ApiController extends Controller
 
                 if ($collection === null) {
                     $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
-                        '/Modules/Media/Files',
                         $path,
                         $request->header->account,
                         __DIR__ . '/../../../Modules/Media/Files' . $path
@@ -317,6 +325,15 @@ final class ApiController extends Controller
         }
     }
 
+    /**
+     * Create media directory path
+     *
+     * @param EditorDoc $doc Doc
+     *
+     * @return string
+     *
+     * @since 1.0.0
+     */
     private function createEditorDir(EditorDoc $doc) : string
     {
         return '/Modules/Editor/'
@@ -342,9 +359,9 @@ final class ApiController extends Controller
         $doc->plain       = (string) ($request->getData('plain') ?? '');
         $doc->content     = Markdown::parse((string) ($request->getData('plain') ?? ''));
         $doc->isVersioned = (bool) ($request->getData('versioned') ?? false);
-        $doc->setVirtualPath((string) ($request->getData('virtualpath') ?? '/'));
         $doc->createdBy   = new NullAccount($request->header->account);
         $doc->version     = (string) ($request->getData('version') ?? '');
+        $doc->setVirtualPath((string) ($request->getData('virtualpath') ?? '/'));
 
         if (!empty($tags = $request->getDataJson('tags'))) {
             foreach ($tags as $tag) {
@@ -366,6 +383,15 @@ final class ApiController extends Controller
         return $doc;
     }
 
+    /**
+     * Create an editor history version
+     *
+     * @param EditorDoc $doc Editor document
+     *
+     * @return EditorDocHistory
+     *
+     * @since 1.0.0
+     */
     private function createHistory(EditorDoc $doc) : EditorDocHistory
     {
         $history = EditorDocHistory::createFromDoc($doc);

Models/EditorDocHistory.php

@@ -104,6 +104,15 @@ class EditorDocHistory implements \JsonSerializable
         $this->createdAt = new \DateTimeImmutable('now');
     }
 
+    /**
+     * Create history form model
+     *
+     * @param EditorDoc $doc Document
+     *
+     * @return self
+     *
+     * @since 1.0.0
+     */
     public static function createFromDoc(EditorDoc $doc) : self
     {
         $hist            = new self();