From a1b0f6ad60fcc95ed1f18cee659fb25f2a7a935d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 27 Nov 2020 22:56:16 +0100
Subject: [PATCH] phpstan fixes

---
 Admin/Installer.php          |  4 +--
 Controller/ApiController.php |  6 ++--
 Models/WikiCategory.php      | 30 ++-----------------
 Models/WikiDoc.php           | 56 ++----------------------------------
 4 files changed, 9 insertions(+), 87 deletions(-)

diff --git a/Admin/Installer.php b/Admin/Installer.php
index 76913c5..9aeb80a 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -48,7 +48,7 @@ final class Installer extends InstallerAbstract
         $id = WikiAppMapper::create($app);
 
         $category = new WikiCategory();
-        $category->setApp(new NullWikiApp($id));
+        $category->app = new NullWikiApp($id);
         $category->setName('Default');
 
         WikiCategoryMapper::create($category);
@@ -62,7 +62,7 @@ final class Installer extends InstallerAbstract
             $id = WikiAppMapper::create($app);
 
             $category = new WikiCategory();
-            $category->setApp(new NullWikiApp($id));
+            $category->app = new NullWikiApp($id);
             $category->setName('Default');
         }
     }
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index d315a35..a605546 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -89,10 +89,10 @@ final class ApiController extends Controller
         $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->category = new NullWikiCategory((int) ($request->getData('category') ?? 1));
         $doc->setLanguage((string) ($request->getData('language') ?? $request->getLanguage()));
         $doc->setStatus((int) ($request->getData('status') ?? WikiStatus::INACTIVE));
-        $doc->setApp(new NullWikiApp((int) ($request->getData('app') ?? 1)));
+        $doc->app = new NullWikiApp((int) ($request->getData('app') ?? 1));
 
         if (!empty($tags = $request->getDataJson('tags'))) {
             foreach ($tags as $tag) {
@@ -335,7 +335,7 @@ final class ApiController extends Controller
     public function createWikiCategoryFromRequest(RequestAbstract $request) : WikiCategory
     {
         $category = new WikiCategory();
-        $category->setApp(new NullWikiApp((int) ($request->getData('app') ?? 1)));
+        $category->app = new NullWikiApp((int) ($request->getData('app') ?? 1));
 
         if ($request->getData('parent') !== null) {
             $category->parent = new NullWikiCategory((int) $request->getData('parent'));
diff --git a/Models/WikiCategory.php b/Models/WikiCategory.php
index 94792fe..8b8f4ea 100755
--- a/Models/WikiCategory.php
+++ b/Models/WikiCategory.php
@@ -42,7 +42,7 @@ class WikiCategory implements \JsonSerializable
      * @var WikiApp
      * @since 1.0.0
      */
-    private WikiApp $app;
+    public WikiApp $app;
 
     /**
      * Name.
@@ -91,32 +91,6 @@ class WikiCategory implements \JsonSerializable
         return $this->id;
     }
 
-    /**
-     * Get app
-     *
-     * @return WikiApp
-     *
-     * @since 1.0.0
-     */
-    public function getApp() : WikiApp
-    {
-        return $this->app ?? new NullWikiApp();
-    }
-
-    /**
-     * Set app
-     *
-     * @param null|WikiApp $app App
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setApp(?WikiApp $app) : void
-    {
-        $this->app = $app;
-    }
-
     /**
      * Get name
      *
@@ -132,7 +106,7 @@ class WikiCategory implements \JsonSerializable
     /**
      * Set name
      *
-     * @param string|TagL11n $name Tag article name
+     * @param string|WikiCategoryL11n $name Tag article name
      *
      * @return void
      *
diff --git a/Models/WikiDoc.php b/Models/WikiDoc.php
index 415415f..6eb8609 100755
--- a/Models/WikiDoc.php
+++ b/Models/WikiDoc.php
@@ -42,7 +42,7 @@ class WikiDoc implements \JsonSerializable
      * @var null|WikiApp
      * @since 1.0.0
      */
-    private ?WikiApp $app = null;
+    public ?WikiApp $app = null;
 
     /**
      * Name.
@@ -82,7 +82,7 @@ class WikiDoc implements \JsonSerializable
      * @var null|WikiCategory
      * @since 1.0.0
      */
-    private ?WikiCategory $category = null;
+    public ?WikiCategory $category = null;
 
     /**
      * Language.
@@ -112,32 +112,6 @@ class WikiDoc implements \JsonSerializable
         return $this->id;
     }
 
-    /**
-     * Get app
-     *
-     * @return WikiApp
-     *
-     * @since 1.0.0
-     */
-    public function getApp() : WikiApp
-    {
-        return $this->app ?? new NullWikiApp();
-    }
-
-    /**
-     * Set app
-     *
-     * @param null|WikiApp $app App
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setApp(?WikiApp $app) : void
-    {
-        $this->app = $app;
-    }
-
     /**
      * Get language
      *
@@ -190,32 +164,6 @@ class WikiDoc implements \JsonSerializable
         $this->status = $status;
     }
 
-    /**
-     * Get category
-     *
-     * @return WikiCategory
-     *
-     * @since 1.0.0
-     */
-    public function getCategory() : WikiCategory
-    {
-        return $this->category ?? new NullWikiCategory();
-    }
-
-    /**
-     * Set cateogry
-     *
-     * @param null|WikiCategory $category Category
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setCategory(?WikiCategory $category) : void
-    {
-        $this->category = $category;
-    }
-
     /**
      * Get tags
      *