Handle nullable prefix system config (#317)

letsdrink · Jul 12, 2023 · 74bb917 · 74bb917
1 parent 34cd2cf
commit 74bb917
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/bootstrap_test.php b/bootstrap_test.php
@@ -7,4 +7,4 @@
 
 mb_internal_encoding("UTF-8");
 
-require 'vendor/autoload.php';
+require 'vendor/autoload.php';
diff --git a/src/Ouzo/Core/Uri.php b/src/Ouzo/Core/Uri.php
@@ -106,8 +106,8 @@ public function getAction(): ?string
     private function parsePath(string $path = null, int $limit = null): array
     {
         if ($path != null) {
-            $prefix = Config::getValue('global', 'prefix_system');
-            $pathWithoutPrefix = urldecode(str_replace($prefix, '', $path));
+            $prefix = Config::getValue('global', 'prefix_system') ?: Strings::EMPTY;
+            $pathWithoutPrefix = urldecode(str_replace($prefix, Strings::EMPTY, $path));
             return preg_split('#/|\?#', $pathWithoutPrefix, $limit ?: -1, PREG_SPLIT_NO_EMPTY);
         }
         return [];

diff --git a/test/src/Ouzo/Core/UriTest.php b/test/src/Ouzo/Core/UriTest.php
@@ -340,6 +340,21 @@ public function shouldReturnCorrectProtocol(string $header, mixed $value, string
         $this->assertEquals($expected, $protocol);
     }
 
+    #[Test]
+    public function should(): void
+    {
+        //given
+        Config::overrideProperty('global', 'prefix_system')->with(null);
+
+        $this->path(Config::getPrefixSystem() . '/users');
+
+        //when
+        $rawController = $this->uri->getRawController();
+
+        //then
+        $this->assertEquals('users', $rawController);
+    }
+
     public static function protocols(): array
     {
         return [