From 44a4adaa3c9590ce3b5db0dfd6082616bcb6e411 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 29 Oct 2021 14:49:55 +0200
Subject: [PATCH] bug and media fixes

---
 Models/DrawImage.php                   |  2 +-
 Models/NullDrawImage.php               |  2 +-
 tests/Bootstrap.php                    |  2 +-
 tests/Controller/ApiControllerTest.php | 16 +++++-----------
 tests/Models/DrawImageTest.php         |  2 +-
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Models/DrawImage.php b/Models/DrawImage.php
index 855c6c9..080ef7a 100755
--- a/Models/DrawImage.php
+++ b/Models/DrawImage.php
@@ -85,7 +85,7 @@ class DrawImage implements \JsonSerializable, ArrayableInterface
      */
     public static function fromMedia(Media $media) : self
     {
-        $image = new self();
+        $image        = new self();
         $image->media = $media;
 
         return $image;
diff --git a/Models/NullDrawImage.php b/Models/NullDrawImage.php
index 8430d14..ab10946 100755
--- a/Models/NullDrawImage.php
+++ b/Models/NullDrawImage.php
@@ -24,7 +24,7 @@ namespace Modules\Draw\Models;
  */
 final class NullDrawImage extends DrawImage
 {
-	/**
+    /**
      * Constructor
      *
      * @param int $id Model id
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 051ac7e..f5fc99c 100755
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -392,4 +392,4 @@ function phpServe() : void
     });
 }
 
-phpServe();
+\phpServe();
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index b570a20..2aceb4e 100644
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -16,27 +16,21 @@ namespace Modules\Draw\tests\Controller;
 
 use Model\CoreSettings;
 use Modules\Admin\Models\AccountPermission;
-use phpOMS\DataStorage\Session\HttpSession;
 use phpOMS\Account\Account;
 use phpOMS\Account\AccountManager;
 use phpOMS\Account\PermissionType;
 use phpOMS\Application\ApplicationAbstract;
+use phpOMS\DataStorage\Session\HttpSession;
 use phpOMS\Dispatcher\Dispatcher;
 use phpOMS\Event\EventManager;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\ModuleManager;
-use phpOMS\Router\WebRouter;
-use phpOMS\Utils\TestUtils;
-use phpOMS\Localization\ISO639x1Enum;
-use Modules\Media\Models\MediaMapper;
-use Modules\Media\Models\PathSettings;
-use Modules\Media\Models\UploadStatus;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
-use phpOMS\System\File\Local\Directory;
+use phpOMS\Module\ModuleAbstract;
+use phpOMS\Module\ModuleManager;
+use phpOMS\Router\WebRouter;
 use phpOMS\Uri\HttpUri;
-use phpOMS\DataStorage\Database\DatabaseType;
+use phpOMS\Utils\TestUtils;
 
 /**
  * @testdox Modules\Draw\tests\Controller\ApiControllerTest: Draw api controller
diff --git a/tests/Models/DrawImageTest.php b/tests/Models/DrawImageTest.php
index 3bd1b74..d658870 100644
--- a/tests/Models/DrawImageTest.php
+++ b/tests/Models/DrawImageTest.php
@@ -39,7 +39,7 @@ final class DrawImageTest extends \PHPUnit\Framework\TestCase
     public function testDefault() : void
     {
         self::assertEquals(0, $this->img->getId());
-        self::assertEquals(null, $this->img->media);
+        self::assertNull($this->img->media);
     }
 
     /**