From 520be0d9e1eb3f8be5b90baa09ce9298f1f1bbac Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Mon, 26 Dec 2022 20:52:58 +0100
Subject: [PATCH] fix phpstan lvl 9 bugs

---
 Admin/Installer.php                          | 15 +++++++++++----
 Controller/ApiController.php                 | 12 +++++++++---
 Theme/Backend/Components/Editor/TextView.php |  1 +
 Theme/Backend/editor-single.tpl.php          |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Admin/Installer.php b/Admin/Installer.php
index 7448618..62dce0e 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -108,6 +108,7 @@ final class Installer extends InstallerAbstract
         $apiApp->moduleManager  = $app->moduleManager;
         $apiApp->eventManager   = $app->eventManager;
 
+        /** @var array{type:array} $editorData */
         foreach ($editorData as $editor) {
             switch ($editor['type']) {
                 case 'type':
@@ -126,11 +127,11 @@ final class Installer extends InstallerAbstract
      * @param ApplicationAbstract $app  Application
      * @param array               $data Type info
      *
-     * @return EditorDocType
+     * @return array
      *
      * @since 1.0.0
      */
-    private static function createType(ApplicationAbstract $app, array $data) : EditorDocType
+    private static function createType(ApplicationAbstract $app, array $data) : array
     {
         /** @var \Modules\Editor\Controller\ApiController $module */
         $module = $app->moduleManager->get('Editor');
@@ -143,7 +144,13 @@ final class Installer extends InstallerAbstract
 
         $module->apiEditorDocTypeCreate($request, $response);
 
-        $type = $response->get('')['response'];
+        $responseData = $response->get('');
+        if (!\is_array($responseData)) {
+            return [];
+        }
+
+        /** @var \Modules\Editor\Models\EditorDocType $type */
+        $type = $responseData['response'];
         $id   = $type->getId();
 
         foreach ($data['l11n'] as $l11n) {
@@ -158,6 +165,6 @@ final class Installer extends InstallerAbstract
             $module->apiEditorDocTypeL11nCreate($request, $response);
         }
 
-        return $type;
+        return $type->toArray();
     }
 }
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index d9394dc..7b1ce9a 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -109,7 +109,7 @@ final class ApiController extends Controller
     private function createDocTypeFromRequest(RequestAbstract $request) : EditorDocType
     {
         $type       = new EditorDocType();
-        $type->name = $request->getData('name');
+        $type->name = (string) ($request->getData('name') ?? '');
 
         if (!empty($request->getData('title'))) {
             $type->setL11n($request->getData('title'), $request->getData('lang') ?? $request->getLanguage());
@@ -376,7 +376,12 @@ final class ApiController extends Controller
 
                     $internalResponse = new HttpResponse();
                     $this->app->moduleManager->get('Tag')->apiTagCreate($request, $internalResponse, null);
-                    $doc->addTag($internalResponse->get($request->uri->__toString())['response']);
+
+                    if (!\is_array($data = $internalResponse->get($request->uri->__toString()))) {
+                        continue;
+                    }
+
+                    $doc->addTag($data['response']);
                 } else {
                     $doc->addTag(new NullTag((int) $tag['id']));
                 }
@@ -418,7 +423,8 @@ final class ApiController extends Controller
     public function apiEditorUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         /** @var \Modules\Editor\Models\EditorDoc $old */
-        $old = clone EditorDocMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $old = EditorDocMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $old = clone $old;
         $new = $this->updateEditorFromRequest($request);
         $this->updateModel($request->header->account, $old, $new, EditorDocMapper::class, 'doc', $request->getOrigin());
 
diff --git a/Theme/Backend/Components/Editor/TextView.php b/Theme/Backend/Components/Editor/TextView.php
index 8802d9e..5cfd8e7 100755
--- a/Theme/Backend/Components/Editor/TextView.php
+++ b/Theme/Backend/Components/Editor/TextView.php
@@ -226,6 +226,7 @@ class TextView extends View
      */
     public function render(mixed ...$data) : string
     {
+        /** @var array{0:null|string, 1:null|string, 2:null|string, 3:null|string, 4:null|string, 5:null|string, 6:null|string, 7:null|string, 8:null|string} $data */
         $this->id            = $data[0] ?? '';
         $this->name          = $data[1] ?? '';
         $this->form          = $data[2] ?? '';
diff --git a/Theme/Backend/editor-single.tpl.php b/Theme/Backend/editor-single.tpl.php
index e6e6b18..f144b0e 100755
--- a/Theme/Backend/editor-single.tpl.php
+++ b/Theme/Backend/editor-single.tpl.php
@@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
                 <div class="row">
                     <div class="col-xs-6 overflowfix">
                         <?php foreach ($tags as $tag) : ?>
-                            <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= $tag->icon !== null ? '<i class="' . $this->printHtml($tag->icon ?? '') . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                            <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= !emptty($tag->icon) ? '<i class="' . $this->printHtml($tag->icon) . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
                         <?php endforeach; ?>
                     </div>
                     <?php if ($editable) : ?>