Finish fix

codeigniter4 · Jun 2, 2022 · 42563c2 · 42563c2
1 parent 43beea2
commit 42563c2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 7 deletions.
diff --git a/system/Common.php b/system/Common.php
@@ -1015,12 +1015,25 @@ function slash_item(string $item): ?string
     {
         $config = config(App::class);
 
-        if (property_exists($config, $item)) {
-            $configItem = $config->{$item};
+        if (! property_exists($config, $item)) {
+            return null;
         }
 
-        if (! isset($configItem) || empty(trim($configItem))) {
-            return null;
+        $configItem = $config->{$item};
+
+        if (! is_scalar($configItem)) {
+            throw new RuntimeException(sprintf(
+                'Cannot convert "%s::$%s" of type "%s" to type "string".',
+                App::class,
+                $item,
+                gettype($configItem)
+            ));
+        }
+
+        $configItem = trim((string) $configItem);
+
+        if ($configItem === '') {
+            return $configItem;
         }
 
         return rtrim($configItem, '/') . '/';

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -30,6 +30,7 @@
 use Config\Logger;
 use Config\Modules;
 use Kint;
+use RuntimeException;
 use stdClass;
 use Tests\Support\Models\JobModel;
 
@@ -390,9 +391,28 @@ 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->assertSame('', slash_item('cookieDomain')); // ''
+        $this->assertSame('en/', slash_item('defaultLocale')); // en
+        $this->assertSame('7200/', slash_item('sessionExpiration')); // int 7200
+        $this->assertSame('', slash_item('negotiateLocale')); // false
+        $this->assertSame('1/', slash_item('cookieHTTPOnly')); // true
+    }
+
+    public function testSlashItemOnInexistentItem()
+    {
+        $this->assertNull(slash_item('foo'));
+        $this->assertNull(slash_item('bar'));
+        $this->assertNull(slash_item('cookieDomains'));
+        $this->assertNull(slash_item('indices'));
+    }
+
+    public function testSlashItemThrowsErrorOnNonStringableItem()
+    {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Cannot convert "Config\\App::$supportedLocales" of type "array" to type "string".');
+
+        slash_item('supportedLocales');
     }
 
     protected function injectSessionMock()