From e09ac0686e948ddd36b77fd1d65687e2b6e7951f Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 10 Oct 2020 21:28:38 +0200
Subject: [PATCH] add tests

---
 Message/Http/HttpRequest.php | 11 ++++++++---
 Module/ModuleManager.php     | 14 ++++++++++----
 Uri/HttpUri.php              |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Message/Http/HttpRequest.php b/Message/Http/HttpRequest.php
index 8d946af93..bd9b10635 100644
--- a/Message/Http/HttpRequest.php
+++ b/Message/Http/HttpRequest.php
@@ -444,11 +444,16 @@ final class HttpRequest extends RequestAbstract
     {
         $this->hash = [\sha1('')];
         $pathArray  = $this->uri->getPathElements();
+        $pathLength = \count($pathArray);
+
+        for ($i = $start; $i < $pathLength; ++$i) {
+            if ($pathArray[$i] === '') {
+                continue;
+            }
 
-        foreach ($pathArray as $key => $path) {
             $paths = [];
-            for ($i = $start; $i <= $key; ++$i) {
-                $paths[] = $pathArray[$i];
+            for ($j = $start; $j <= $i; ++$j) {
+                $paths[] = $pathArray[$j];
             }
 
             $this->hash[] = \sha1(\implode('', $paths));
diff --git a/Module/ModuleManager.php b/Module/ModuleManager.php
index d26d18696..ca186db4a 100644
--- a/Module/ModuleManager.php
+++ b/Module/ModuleManager.php
@@ -140,12 +140,18 @@ final class ModuleManager
     public function getLanguageFiles(RequestAbstract $request, string $app = null) : array
     {
         $files = $this->getUriLoad($request);
+        if (!isset($files['5'])) {
+            return [];
+        }
 
         $lang = [];
-        if (isset($files['5'])) {
-            foreach ($files['5'] as $module) {
-                $lang[] = '/Modules/' . $module['module_load_from'] . '/Theme/' . ($app ?? $this->app->appName) . '/Lang/' . $module['module_load_file'];
-            }
+        foreach ($files['5'] as $module) {
+            $lang[] = '/Modules/'
+                . $module['module_load_from']
+                . '/Theme/'
+                . ($app ?? $this->app->appName)
+                . '/Lang/'
+                . $module['module_load_file'];
         }
 
         return $lang;
diff --git a/Uri/HttpUri.php b/Uri/HttpUri.php
index 21d28b1f6..d0e339ffe 100644
--- a/Uri/HttpUri.php
+++ b/Uri/HttpUri.php
@@ -195,7 +195,7 @@ final class HttpUri implements UriInterface
             $this->path = $path;
         }
 
-        $this->pathElements = \explode('/', \ltrim($this->path, '/'));
+        $this->pathElements = \explode('/', \trim($this->path, '/'));
         $this->queryString  = $url['query'] ?? '';
 
         if (!empty($this->queryString)) {