Finish fix

codeigniter4 · Jun 1, 2022 · 0cb9f33 · 0cb9f33
1 parent 43beea2
commit 0cb9f33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/system/Common.php b/system/Common.php
@@ -1015,11 +1015,13 @@ function slash_item(string $item): ?string
     {
         $config = config(App::class);
 
+        $configItem = '';
+
         if (property_exists($config, $item)) {
-            $configItem = $config->{$item};
+            $configItem = (string) $config->{$item};
         }
 
-        if (! isset($configItem) || empty(trim($configItem))) {
+        if (trim($configItem) === '') {
             return null;
         }
 

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -390,9 +390,9 @@ public function testReallyWritable()
 
     public function testSlashItem()
     {
-        $this->assertSame('/', slash_item('cookiePath')); // slash already there
-        $this->assertNull(null, slash_item('cookieDomain')); // empty, so untouched
-        $this->assertSame('en/', slash_item('defaultLocale')); // slash appended
+        $this->assertSame('/', slash_item('cookiePath'));
+        $this->assertNull(slash_item('cookieDomain'));
+        $this->assertSame('en/', slash_item('defaultLocale'));
     }
 
     protected function injectSessionMock()