prevent silent failure when accessing an invalid superglobal

Author: michalsn

system/Superglobals.php

@@ -13,6 +13,8 @@
 
 namespace CodeIgniter;
 
+use CodeIgniter\Exceptions\InvalidArgumentException;
+
 /**
  * Superglobals manipulation.
  *
@@ -348,6 +350,8 @@ public function setFilesArray(array $array): void
      * @param string $name The superglobal name (server, get, post, cookie, files, request)
      *
      * @return array<string, server_items>
+     *
+     * @throws InvalidArgumentException If the superglobal name is invalid
      */
     public function getGlobalArray(string $name): array
     {
@@ -358,7 +362,9 @@ public function getGlobalArray(string $name): array
             'cookie'  => $this->cookie,
             'files'   => $this->files,
             'request' => $this->request,
-            default   => [],
+            default   => throw new InvalidArgumentException(
+                "Invalid superglobal name '{$name}'. Must be one of: server, get, post, cookie, files, request.",
+            ),
         };
     }
 
@@ -367,6 +373,8 @@ public function getGlobalArray(string $name): array
      *
      * @param string                      $name  The superglobal name (server, get, post, cookie, files, request)
      * @param array<string, server_items> $array The array to set
+     *
+     * @throws InvalidArgumentException If the superglobal name is invalid
      */
     public function setGlobalArray(string $name, array $array): void
     {
@@ -377,7 +385,9 @@ public function setGlobalArray(string $name, array $array): void
             'cookie'  => $this->setCookieArray($array),
             'files'   => $this->setFilesArray($array),
             'request' => $this->setRequestArray($array),
-            default   => null,
+            default   => throw new InvalidArgumentException(
+                "Invalid superglobal name '{$name}'. Must be one of: server, get, post, cookie, files, request.",
+            ),
         };
     }
 }

tests/system/SuperglobalsTest.php

@@ -13,6 +13,7 @@
 
 namespace CodeIgniter;
 
+use CodeIgniter\Exceptions\InvalidArgumentException;
 use CodeIgniter\Test\CIUnitTestCase;
 use PHPUnit\Framework\Attributes\BackupGlobals;
 use PHPUnit\Framework\Attributes\Group;
@@ -385,9 +386,12 @@ public function testGetGlobalArrayForFiles(): void
         $this->assertSame($filesData, $this->superglobals->getGlobalArray('files'));
     }
 
-    public function testGetGlobalArrayReturnsEmptyForInvalid(): void
+    public function testGetGlobalArrayThrowsExceptionForInvalidName(): void
     {
-        $this->assertSame([], $this->superglobals->getGlobalArray('invalid'));
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid superglobal name 'invalid'. Must be one of: server, get, post, cookie, files, request.");
+
+        $this->superglobals->getGlobalArray('invalid');
     }
 
     public function testSetGlobalArray(): void
@@ -418,12 +422,12 @@ public function testSetGlobalArrayForFiles(): void
         $this->assertSame($filesData, $_FILES);
     }
 
-    public function testSetGlobalArrayWithInvalidNameDoesNothing(): void
+    public function testSetGlobalArrayThrowsExceptionForInvalidName(): void
     {
-        $this->superglobals->setGlobalArray('invalid', ['key' => 'value']);
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid superglobal name 'invalid'. Must be one of: server, get, post, cookie, files, request.");
 
-        // Should not throw exception, just does nothing
-        $this->assertTrue(true);
+        $this->superglobals->setGlobalArray('invalid', ['key' => 'value']);
     }
 
     // Constructor tests

utils/phpstan-baseline/loader.neon

@@ -1,4 +1,4 @@
-# total 2199 errors
+# total 2198 errors
 
 includes:
     - argument.type.neon

utils/phpstan-baseline/method.alreadyNarrowedType.neon

@@ -1,4 +1,4 @@
-# total 23 errors
+# total 22 errors
 
 parameters:
     ignoreErrors:
@@ -77,11 +77,6 @@ parameters:
             count: 3
             path: ../../tests/system/Security/SecurityTest.php
 
-        -
-            message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
-            count: 1
-            path: ../../tests/system/SuperglobalsTest.php
-
         -
             message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertIsNumeric\(\) with int will always evaluate to true\.$#'
             count: 1