From 26e056d0681d43b9050e88e0c72ae676ab511db7 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Sat, 6 May 2023 11:42:05 +0000
Subject: [PATCH] make id public, organigram impl. media password/encryption,
 settings bug fix, Money->FloatInt change, ...

---
 Models/DrawImage.php                   | 2 +-
 Theme/Backend/draw-list.tpl.php        | 2 +-
 tests/Controller/ApiControllerTest.php | 2 +-
 tests/Models/DrawImageTest.php         | 2 +-
 tests/Models/NullDrawImageTest.php     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Models/DrawImage.php b/Models/DrawImage.php
index 2e1d3b8..7704702 100755
--- a/Models/DrawImage.php
+++ b/Models/DrawImage.php
@@ -32,7 +32,7 @@ class DrawImage implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Media object.
diff --git a/Theme/Backend/draw-list.tpl.php b/Theme/Backend/draw-list.tpl.php
index 69ecdb9..413fa0f 100755
--- a/Theme/Backend/draw-list.tpl.php
+++ b/Theme/Backend/draw-list.tpl.php
@@ -37,7 +37,7 @@ echo $this->getData('nav')->render(); ?>
                     <td><?= $this->getHtml('Created'); ?>
                 <tbody>
                 <?php $count = 0; foreach ($images as $key => $value) : ++$count;
-                $url         = \phpOMS\Uri\UriFactory::build('draw/single?{?}&id=' . $value->getId()); ?>
+                $url         = \phpOMS\Uri\UriFactory::build('draw/single?{?}&id=' . $value->id); ?>
                     <tr>
                         <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->media->name); ?></a>
                         <td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->media->createdBy->login); ?></a>
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 048414e..01af069 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -108,7 +108,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $this->module->apiDrawCreate($request, $response);
 
         self::assertEquals('Draw Title', $response->get('')['response']->media->name);
-        self::assertGreaterThan(0, $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $response->get('')['response']->id);
     }
 
     /**
diff --git a/tests/Models/DrawImageTest.php b/tests/Models/DrawImageTest.php
index b1e75ac..5097784 100755
--- a/tests/Models/DrawImageTest.php
+++ b/tests/Models/DrawImageTest.php
@@ -38,7 +38,7 @@ final class DrawImageTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->img->getId());
+        self::assertEquals(0, $this->img->id);
         self::assertNull($this->img->media);
     }
 
diff --git a/tests/Models/NullDrawImageTest.php b/tests/Models/NullDrawImageTest.php
index 126347f..bec5c49 100755
--- a/tests/Models/NullDrawImageTest.php
+++ b/tests/Models/NullDrawImageTest.php
@@ -37,6 +37,6 @@ final class NullDrawImageTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullDrawImage(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }