From 1d42d45d390232749ebe9d81e5ebdd6c83855419 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 25 Dec 2022 00:06:17 +0100
Subject: [PATCH] test fixes and changes for release

---
 Models/Resource.php              |  8 ++++----
 Theme/Backend/admin-logs.tpl.php | 10 +++++-----
 tests/Bootstrap.php              | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Models/Resource.php b/Models/Resource.php
index a3321be..c47013d 100644
--- a/Models/Resource.php
+++ b/Models/Resource.php
@@ -46,7 +46,7 @@ class Resource implements \JsonSerializable
     /**
      * Uri.
      *
-     * @var int
+     * @var string
      * @since 1.0.0
      */
     public string $uri = '';
@@ -70,7 +70,7 @@ class Resource implements \JsonSerializable
     /**
      * Xpath.
      *
-     * @var int
+     * @var string
      * @since 1.0.0
      */
     public string $xpath = '';
@@ -78,7 +78,7 @@ class Resource implements \JsonSerializable
     /**
      * Hash.
      *
-     * @var int
+     * @var string
      * @since 1.0.0
      */
     public string $hash = '';
@@ -86,7 +86,7 @@ class Resource implements \JsonSerializable
     /**
      * Last version path.
      *
-     * @var int
+     * @var string
      * @since 1.0.0
      */
     public string $lastVersionPath = '';
diff --git a/Theme/Backend/admin-logs.tpl.php b/Theme/Backend/admin-logs.tpl.php
index 5c8b6d7..8bbe50f 100644
--- a/Theme/Backend/admin-logs.tpl.php
+++ b/Theme/Backend/admin-logs.tpl.php
@@ -100,13 +100,13 @@ $next = $tableView->getNextLink(
                     $url = UriFactory::build('{/lang}/{/app}/'{/lang}/{/app}/admin/audit/single?id=' . $audit->getId()); ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
                         <td><?= $audit->getId(); ?>
-                        <td><?php if ($audit->getOld() === null) : echo $this->getHtml('CREATE', '0', '0'); ?>
-                            <?php elseif ($audit->getOld() !== null && $audit->getNew() !== null) : echo $this->getHtml('UPDATE', '0', '0'); ?>
-                            <?php elseif ($audit->getNew() === null) : echo $this->getHtml('DELETE', '0', '0'); ?>
+                        <td><?php if ($audit->old === null) : echo $this->getHtml('CREATE', '0', '0'); ?>
+                            <?php elseif ($audit->old !== null && $audit->new !== null) : echo $this->getHtml('UPDATE', '0', '0'); ?>
+                            <?php elseif ($audit->new === null) : echo $this->getHtml('DELETE', '0', '0'); ?>
                             <?php else : echo $this->getHtml('UNKNOWN', '0', '0'); ?>
                             <?php endif; ?>
-                        <td><?= $audit->getType(); ?>
-                        <td><?= $audit->getTrigger(); ?>
+                        <td><?= $audit->type; ?>
+                        <td><?= $audit->trigger; ?>
                         <td><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/'{/lang}/{/app}/admin/account/settings?id=' . $audit->createdBy->getId()); ?>"><?= $this->printHtml(
                                 $this->renderUserName('%3$s %2$s %1$s', [$audit->createdBy->name1, $audit->createdBy->name2, $audit->createdBy->name3, $audit->createdBy->login])
                             ); ?></a>
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index d46fd31..b5d36a8 100755
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -257,6 +257,25 @@ $CONFIG = [
         'root'  => '/',
         'https' => false,
     ],
+    'app'      => [
+        'path'    => __DIR__,
+        'default' => [
+            'app'   => 'Backend',
+            'id'    => 'backend',
+            'lang'  => 'en',
+            'theme' => 'Backend',
+            'org'   => 1,
+        ],
+        'domains' => [
+            '127.0.0.1' => [
+                'app'   => 'Backend',
+                'id'    => 'backend',
+                'lang'  => 'en',
+                'theme' => 'Backend',
+                'org'   => 1,
+            ],
+        ],
+    ],
     'socket'   => [
         'master' => [
             'host'  => '127.0.0.1',