continue with superglobals

michalsn · michalsn · commit 1b1440f6e00d · 2025-12-28T17:11:35.000+01:00
diff --git a/system/Commands/Utilities/Environment.php b/system/Commands/Utilities/Environment.php
@@ -86,7 +86,7 @@ final class Environment extends BaseCommand
     public function run(array $params)
     {
         if ($params === []) {
-            CLI::write(sprintf('Your environment is currently set as %s.', CLI::color($_SERVER['CI_ENVIRONMENT'] ?? ENVIRONMENT, 'green')));
+            CLI::write(sprintf('Your environment is currently set as %s.', CLI::color(service('superglobals')->server('CI_ENVIRONMENT') ?? ENVIRONMENT, 'green')));
             CLI::newLine();
 
             return EXIT_ERROR;
@@ -119,7 +119,8 @@ public function run(array $params)
         // force DotEnv to reload the new environment
         // however we cannot redefine the ENVIRONMENT constant
         putenv('CI_ENVIRONMENT');
-        unset($_ENV['CI_ENVIRONMENT'], $_SERVER['CI_ENVIRONMENT']);
+        unset($_ENV['CI_ENVIRONMENT']);
+        service('superglobals')->unsetServer('CI_ENVIRONMENT');
         (new DotEnv((new Paths())->envDirectory ?? ROOTPATH))->load();
 
         CLI::write(sprintf('Environment is successfully changed to "%s".', $env), 'green');
@@ -149,7 +150,7 @@ private function writeNewEnvironmentToEnvFile(string $newEnv): bool
             copy($baseEnv, $envFile);
         }
 
-        $pattern = preg_quote($_SERVER['CI_ENVIRONMENT'] ?? ENVIRONMENT, '/');
+        $pattern = preg_quote(service('superglobals')->server('CI_ENVIRONMENT') ?? ENVIRONMENT, '/');
         $pattern = sprintf('/^[#\s]*CI_ENVIRONMENT[=\s]+%s$/m', $pattern);
 
         return file_put_contents(
diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
@@ -87,17 +87,14 @@ public function run(array $params)
 
         // Set HTTP_HOST
         if ($host !== null) {
-            $request              = service('request');
-            $_SERVER              = $request->getServer();
-            $_SERVER['HTTP_HOST'] = $host;
-            $request->setGlobal('server', $_SERVER);
+            service('superglobals')->setServer('HTTP_HOST', $host);
         }
 
         $collection = service('routes')->loadRoutes();
 
         // Reset HTTP_HOST
         if ($host !== null) {
-            unset($_SERVER['HTTP_HOST']);
+            service('superglobals')->unsetServer('HTTP_HOST');
         }
 
         $methods = Router::HTTP_METHODS;
diff --git a/system/Config/Services.php b/system/Config/Services.php
@@ -543,7 +543,7 @@ public static function createRequest(App $config, bool $isCli = false): void
             $request = AppServices::incomingrequest($config);
 
             // guess at protocol if needed
-            $request->setProtocolVersion($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1');
+            $request->setProtocolVersion(static::superglobals()->server('SERVER_PROTOCOL') ?? 'HTTP/1.1');
         }
 
         // Inject the request object into Services.
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
@@ -185,7 +185,7 @@ public function getOptionString(bool $useLongOpts = false): string
      */
     protected function parseCommand()
     {
-        $args = $this->getServer('argv');
+        $args = $this->getServer('argv') ?? [];
         array_shift($args); // Scrap index.php
 
         $optionValue = false;
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
@@ -171,9 +171,9 @@ private function getDownloadFileName(): string
          *
          * Reference: http://digiblog.de/2011/04/19/android-and-the-download-file-headers/
          */
-        // @todo: depend super global
-        if (count($x) !== 1 && isset($_SERVER['HTTP_USER_AGENT'])
-                && preg_match('/Android\s(1|2\.[01])/', $_SERVER['HTTP_USER_AGENT'])) {
+        $userAgent = service('superglobals')->server('HTTP_USER_AGENT');
+        if (count($x) !== 1 && $userAgent !== null
+                && preg_match('/Android\s(1|2\.[01])/', $userAgent)) {
             $x[count($x) - 1] = strtoupper($extension);
             $filename         = implode('.', $x);
         }
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -266,7 +266,9 @@ public function isAJAX(): bool
      */
     public function isSecure(): bool
     {
-        if (! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
+        $https = $this->getSuperglobals()->server('HTTPS');
+
+        if ($https !== null && strtolower($https) !== 'off') {
             return true;
         }
 
diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php
@@ -86,19 +86,21 @@ public function appendBody($data): self
      */
     public function populateHeaders(): void
     {
-        $contentType = $_SERVER['CONTENT_TYPE'] ?? getenv('CONTENT_TYPE');
+        $contentType = service('superglobals')->server('CONTENT_TYPE') ?? getenv('CONTENT_TYPE');
         if (! empty($contentType)) {
             $this->setHeader('Content-Type', $contentType);
         }
         unset($contentType);
 
-        foreach (array_keys($_SERVER) as $key) {
+        $serverArray = service('superglobals')->getServerArray();
+
+        foreach (array_keys($serverArray) as $key) {
             if (sscanf($key, 'HTTP_%s', $header) === 1) {
                 // take SOME_HEADER and turn it into Some-Header
                 $header = str_replace('_', ' ', strtolower($header));
                 $header = str_replace(' ', '-', ucwords($header));
 
-                $this->setHeader($header, $_SERVER[$key]);
+                $this->setHeader($header, $serverArray[$key]);
 
                 // Add us to the header map, so we can find them case-insensitively
                 $this->headerMap[strtolower($header)] = $header;
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
@@ -451,21 +451,26 @@ public function sendBody()
     public function redirect(string $uri, string $method = 'auto', ?int $code = null)
     {
         // IIS environment likely? Use 'refresh' for better compatibility
+        $superglobals   = service('superglobals');
+        $serverSoftware = $superglobals->server('SERVER_SOFTWARE');
         if (
             $method === 'auto'
-            && isset($_SERVER['SERVER_SOFTWARE'])
-            && str_contains($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS')
+            && $serverSoftware !== null
+            && str_contains($serverSoftware, 'Microsoft-IIS')
         ) {
             $method = 'refresh';
         } elseif ($method !== 'refresh' && $code === null) {
             // override status code for HTTP/1.1 & higher
+            $serverProtocol = $superglobals->server('SERVER_PROTOCOL');
+            $requestMethod  = $superglobals->server('REQUEST_METHOD');
             if (
-                isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD'])
+                $serverProtocol !== null
+                && $requestMethod !== null
                 && $this->getProtocolVersion() >= 1.1
             ) {
-                if ($_SERVER['REQUEST_METHOD'] === Method::GET) {
+                if ($requestMethod === Method::GET) {
                     $code = 302;
-                } elseif (in_array($_SERVER['REQUEST_METHOD'], [Method::POST, Method::PUT, Method::DELETE], true)) {
+                } elseif (in_array($requestMethod, [Method::POST, Method::PUT, Method::DELETE], true)) {
                     // reference: https://en.wikipedia.org/wiki/Post/Redirect/Get
                     $code = 303;
                 } else {
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
@@ -290,12 +290,17 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
 
         // If no selected state was submitted we will attempt to set it automatically
         if ($selected === []) {
+            $superglobals = service('superglobals');
             if (is_array($data)) {
-                if (isset($data['name'], $_POST[$data['name']])) {
-                    $selected = [$_POST[$data['name']]];
+                $postValue = $superglobals->post($data['name'] ?? '');
+                if (isset($data['name']) && $postValue !== null) {
+                    $selected = [$postValue];
+                }
+            } else {
+                $postValue = $superglobals->post($data);
+                if ($postValue !== null) {
+                    $selected = [$postValue];
                 }
-            } elseif (isset($_POST[$data])) {
-                $selected = [$_POST[$data]];
             }
         }
 
diff --git a/system/Router/Router.php b/system/Router/Router.php
@@ -167,7 +167,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
         $this->controller = $this->collection->getDefaultController();
         $this->method     = $this->collection->getDefaultMethod();
 
-        $this->collection->setHTTPVerb($request->getMethod() === '' ? $_SERVER['REQUEST_METHOD'] : $request->getMethod());
+        $this->collection->setHTTPVerb($request->getMethod() === '' ? service('superglobals')->server('REQUEST_METHOD') : $request->getMethod());
 
         $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
 
diff --git a/system/Session/Session.php b/system/Session/Session.php
@@ -243,7 +243,8 @@ public function start()
         $this->startSession();
 
         // Is session ID auto-regeneration configured? (ignoring ajax requests)
-        if ((! isset($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest')
+        $requestedWith = service('superglobals')->server('HTTP_X_REQUESTED_WITH');
+        if (($requestedWith === null || strtolower($requestedWith) !== 'xmlhttprequest')
             && ($regenerateTime = $this->config->timeToUpdate) > 0
         ) {
             if (! isset($_SESSION['__ci_last_regenerate'])) {
diff --git a/system/Superglobals.php b/system/Superglobals.php
@@ -52,8 +52,6 @@ public function __construct(
 
     /**
      * Get a value from $_SERVER
-     *
-     * @return array|float|int|string|null
      */
     public function server(string $key): array|float|int|string|null
     {
@@ -96,8 +94,6 @@ public function setServerArray(array $array): void
 
     /**
      * Get a value from $_GET
-     *
-     * @return array|string|null
      */
     public function get(string $key): array|string|null
     {
@@ -140,8 +136,6 @@ public function setGetArray(array $array): void
 
     /**
      * Get a value from $_POST
-     *
-     * @return array|string|null
      */
     public function post(string $key): array|string|null
     {
@@ -184,8 +178,6 @@ public function setPostArray(array $array): void
 
     /**
      * Get a value from $_COOKIE
-     *
-     * @return array|string|null
      */
     public function cookie(string $key): array|string|null
     {
@@ -228,8 +220,6 @@ public function setCookieArray(array $array): void
 
     /**
      * Get a value from $_REQUEST
-     *
-     * @return array|string|null
      */
     public function request(string $key): array|string|null
     {

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ public static function createRequest(App $config, bool $isCli = false): void`
`543`	`543`	`$request = AppServices::incomingrequest($config);`
`544`	`544`
`545`	`545`	`// guess at protocol if needed`
`546`		`- $request->setProtocolVersion($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1');`
	`546`	`+ $request->setProtocolVersion(static::superglobals()->server('SERVER_PROTOCOL') ?? 'HTTP/1.1');`
`547`	`547`	`}`
`548`	`548`
`549`	`549`	`// Inject the request object into Services.`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public function getOptionString(bool $useLongOpts = false): string`
`185`	`185`	`*/`
`186`	`186`	`protected function parseCommand()`
`187`	`187`	`{`
`188`		`- $args = $this->getServer('argv');`
	`188`	`+ $args = $this->getServer('argv') ?? [];`
`189`	`189`	`array_shift($args); // Scrap index.php`
`190`	`190`
`191`	`191`	`$optionValue = false;`
Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,9 @@ private function getDownloadFileName(): string`
`171`	`171`	`*`
`172`	`172`	`* Reference: http://digiblog.de/2011/04/19/android-and-the-download-file-headers/`
`173`	`173`	`*/`
`174`		`- // @todo: depend super global`
`175`		`- if (count($x) !== 1 && isset($_SERVER['HTTP_USER_AGENT'])`
`176`		`- && preg_match('/Android\s(1\|2\.[01])/', $_SERVER['HTTP_USER_AGENT'])) {`
	`174`	`+ $userAgent = service('superglobals')->server('HTTP_USER_AGENT');`
	`175`	`+ if (count($x) !== 1 && $userAgent !== null`
	`176`	`+ && preg_match('/Android\s(1\|2\.[01])/', $userAgent)) {`
`177`	`177`	`$x[count($x) - 1] = strtoupper($extension);`
`178`	`178`	`$filename = implode('.', $x);`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,9 @@ public function isAJAX(): bool`
`266`	`266`	`*/`
`267`	`267`	`public function isSecure(): bool`
`268`	`268`	`{`
`269`		`- if (! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {`
	`269`	`+ $https = $this->getSuperglobals()->server('HTTPS');`
	`270`	`+`
	`271`	`+ if ($https !== null && strtolower($https) !== 'off') {`
`270`	`272`	`return true;`
`271`	`273`	`}`
`272`	`274`