From 3d57c9b4bee5e4f120fb2b7ed79e3a71bdd6b483 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Mon, 9 Oct 2023 22:06:38 +0000
Subject: [PATCH] update

---
 Theme/Backend/mid-side.tpl.php            | 41 ++++++++++----------
 Theme/Backend/mid.tpl.php                 | 46 +++++++++++++----------
 Theme/Backend/side.tpl.php                |  2 +-
 Theme/Backend/top.tpl.php                 | 11 +++---
 tests/Controller/SearchControllerTest.php |  2 +-
 5 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/Theme/Backend/mid-side.tpl.php b/Theme/Backend/mid-side.tpl.php
index 3d3d769..a75350f 100755
--- a/Theme/Backend/mid-side.tpl.php
+++ b/Theme/Backend/mid-side.tpl.php
@@ -17,23 +17,26 @@ declare(strict_types=1);
  */
 
 /* Looping through all links */
-if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE])) {
-    echo '<div class="b b-5 c3-2 c3" id="i3-2-5">'
-         . '<h1>' . $this->getHtml('Navigation', 'Navigation')
-         . '<i class="fa fa-minus min"></i><i class="fa fa-plus max vh"></i>'
-         . '</h1>'
-         . '<div class="bc-1">'
-         . '<ul id="ms-nav" role="list">';
-
-    foreach ($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE] as $key => $parent) {
-        foreach ($parent as $link) {
-            /** @var array $data */
-            if ($link['nav_parent'] == $data[1]) {
-                echo '<li><a href="' . \phpOMS\Uri\UriFactory::build($link['nav_uri']) . '">'
-                     . $this->getHtml('5', 'Backend', $link['nav_name']) . '</a>';
+if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE])) : ?>
+    <div>
+        <h1>
+            <?= $this->getHtml('Navigation', 'Navigation'); ?>
+            <i class="fa fa-minus min"></i><i class="fa fa-plus max vh"></i>
+        </h1>
+        <div class="bc-1">
+            <ul id="ms-nav" role="list">
+            <?php
+            foreach ($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE] as $key => $parent) {
+                foreach ($parent as $link) {
+                    /** @var array $data */
+                    if ($link['nav_parent'] == $data[1]) {
+                        echo '<li><a href="' , \phpOMS\Uri\UriFactory::build($link['nav_uri']) , '">'
+                            , $this->getHtml('5', 'Backend', $link['nav_name']) , '</a>';
+                    }
+                }
             }
-        }
-    }
-
-    echo '</ul></div></div>';
-}
+            ?>
+            </ul>
+        </div>
+    </div>
+<?php endif;
diff --git a/Theme/Backend/mid.tpl.php b/Theme/Backend/mid.tpl.php
index b2c2e9b..1fe86ec 100755
--- a/Theme/Backend/mid.tpl.php
+++ b/Theme/Backend/mid.tpl.php
@@ -17,23 +17,31 @@ declare(strict_types=1);
  */
 
 if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT])
-    && \phpOMS\Utils\ArrayUtils::inArrayRecursive($this->parent, $this->nav[\Modules\Navigation\Models\NavigationType::CONTENT], 'nav_parent')
-) {
-    echo '<div class="row"><div class="col-xs-12"><ul class="nav-top" role="list">';
+    && \phpOMS\Utils\ArrayUtils::inArrayRecursive(
+        $this->parent,
+        $this->nav[\Modules\Navigation\Models\NavigationType::CONTENT],
+        'nav_parent'
+    )
+) : ?>
+    <div class="row">
+        <div class="col-xs-12">
+            <ul class="nav-top" role="list">
+                <?php
+                $uriPath = $this->request->uri->getPath();
 
-    $uriPath = $this->request->uri->getPath();
-
-    foreach ($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT] as $key => $parent) {
-        foreach ($parent as $link) {
-            if ($link['nav_parent'] === $this->parent) {
-                $uri = \phpOMS\Uri\UriFactory::build($link['nav_uri']);
-                echo '<li'
-                    . (\stripos($uri, $uriPath) !== false ? ' class="active"' : '')
-                    . '><a tabindex="0" href="' . $uri . '">'
-                    . $this->getHtml($link['nav_name'], 'Navigation') . '</a>';
-            }
-        }
-    }
-
-    echo '</ul></div></div>';
-}
+                foreach ($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT] as $key => $parent) {
+                    foreach ($parent as $link) {
+                        if ($link['nav_parent'] === $this->parent) {
+                            $uri = \phpOMS\Uri\UriFactory::build($link['nav_uri']);
+                            echo '<li'
+                                , (\stripos($uri, $uriPath) !== false ? ' class="active"' : '')
+                                , '><a tabindex="0" href="' , $uri , '">'
+                                , $this->getHtml($link['nav_name'], 'Navigation') , '</a>';
+                        }
+                    }
+                }
+                ?>
+            </ul>
+        </div>
+    </div>
+<?php endif;
\ No newline at end of file
diff --git a/Theme/Backend/side.tpl.php b/Theme/Backend/side.tpl.php
index 32038d0..7f256d5 100755
--- a/Theme/Backend/side.tpl.php
+++ b/Theme/Backend/side.tpl.php
@@ -45,4 +45,4 @@ if (isset($this->nav[NavigationType::SIDE])) : ?>
     </ul>
 </div>
 <?php
-endif;
+endif;
\ No newline at end of file
diff --git a/Theme/Backend/top.tpl.php b/Theme/Backend/top.tpl.php
index 0224337..c9d2493 100755
--- a/Theme/Backend/top.tpl.php
+++ b/Theme/Backend/top.tpl.php
@@ -22,14 +22,15 @@ if (isset($this->nav[NavigationType::TOP])) : ?>
         <?php $unread = $this->data['unread'];
         foreach ($this->nav[NavigationType::TOP] as $key => $parent) :
         foreach ($parent as $id => $link) : ?>
-        <li><a id="link-<?= $id; ?>" target="<?= $link['nav_target']; ?>" href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>"<?= $link['nav_action'] !== null ? ' data-action=\'' . $link['nav_action'] . '\'' : ''; ?>>
-
+        <li><a
+            id="link-<?= $id; ?>"
+            target="<?= $link['nav_target']; ?>"
+            href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>"
+            <?= $link['nav_action'] !== null ? ' data-action=\'' . $link['nav_action'] . '\'' : ''; ?>>
                 <?php if (isset($link['nav_icon'])) : ?>
                     <i class="<?= $this->printHtml($link['nav_icon']); ?> infoIcon"><?php if (isset($unread[$link['nav_from']]) && $unread[$link['nav_from']] > 0) : ?><span class="badge"><?= $unread[$link['nav_from']]; ?></span><?php endif; ?></i>
                 <?php endif; ?>
-
                 <span class="link"><?= $this->getHtml($link['nav_name'], 'Navigation'); ?><span></a>
-            <?php endforeach;
-            endforeach; ?>
+        <?php endforeach; endforeach; ?>
     </ul>
 <?php endif;
diff --git a/tests/Controller/SearchControllerTest.php b/tests/Controller/SearchControllerTest.php
index 476e392..7bc8965 100755
--- a/tests/Controller/SearchControllerTest.php
+++ b/tests/Controller/SearchControllerTest.php
@@ -106,7 +106,7 @@ final class SearchControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('app', 'Backend');
 
         $this->module->searchGoto($request, $response);
-        self::assertInstanceOf(Redirect::class, $response->get(''));
+        self::assertInstanceOf(Redirect::class, $response->getData(''));
     }
 
     /**