feat: superglobals

Author: michalsn

system/Config/Services.php

@@ -746,13 +746,16 @@ public static function siteurifactory(
     public static function superglobals(
         ?array $server = null,
         ?array $get = null,
+        ?array $post = null,
+        ?array $cookie = null,
+        ?array $request = null,
         bool $getShared = true,
     ) {
         if ($getShared) {
-            return static::getSharedInstance('superglobals', $server, $get);
+            return static::getSharedInstance('superglobals', $server, $get, $post, $cookie, $request);
         }
 
-        return new Superglobals($server, $get);
+        return new Superglobals($server, $get, $post, $cookie, $request);
     }
 
     /**

system/HTTP/IncomingRequest.php

@@ -599,9 +599,9 @@ public function getPostGet($index = null, $filter = null, $flags = null)
         // Use $_POST directly here, since filter_has_var only
         // checks the initial POST data, not anything that might
         // have been added since.
-        return isset($_POST[$index])
+        return service('superglobals')->post($index) !== null
             ? $this->getPost($index, $filter, $flags)
-            : (isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : $this->getPost($index, $filter, $flags));
+            : (service('superglobals')->get($index) !== null ? $this->getGet($index, $filter, $flags) : $this->getPost($index, $filter, $flags));
     }
 
     /**
@@ -622,9 +622,9 @@ public function getGetPost($index = null, $filter = null, $flags = null)
         // Use $_GET directly here, since filter_has_var only
         // checks the initial GET data, not anything that might
         // have been added since.
-        return isset($_GET[$index])
+        return service('superglobals')->get($index) !== null
             ? $this->getGet($index, $filter, $flags)
-            : (isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : $this->getGet($index, $filter, $flags));
+            : (service('superglobals')->post($index) !== null ? $this->getPost($index, $filter, $flags) : $this->getGet($index, $filter, $flags));
     }
 
     /**

system/HTTP/RedirectResponse.php

@@ -93,8 +93,8 @@ public function withInput()
     {
         $session = service('session');
         $session->setFlashdata('_ci_old_input', [
-            'get'  => $_GET ?? [], // @phpstan-ignore nullCoalesce.variable
-            'post' => $_POST ?? [], // @phpstan-ignore nullCoalesce.variable
+            'get'  => service('superglobals')->getGetArray(),
+            'post' => service('superglobals')->getPostArray(),
         ]);
 
         $this->withErrors();

system/HTTP/RequestTrait.php

@@ -14,6 +14,7 @@
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Exceptions\ConfigException;
+use CodeIgniter\Superglobals;
 use CodeIgniter\Validation\FormatRules;
 use Config\App;
 
@@ -43,13 +44,34 @@ trait RequestTrait
      */
     protected $ipAddress = '';
 
+    /**
+     * Superglobals access wrapper.
+     *
+     * @var Superglobals|null
+     */
+    protected $superglobals;
+
     /**
      * Stores values we've retrieved from PHP globals.
      *
      * @var array{get?: array, post?: array, request?: array, cookie?: array, server?: array}
+     *
+     * @deprecated 4.7.0 Use $superglobals instead
      */
     protected $globals = [];
 
+    /**
+     * Get the Superglobals service instance.
+     */
+    protected function getSuperglobals(): Superglobals
+    {
+        if ($this->superglobals === null) {
+            $this->superglobals = service('superglobals');
+        }
+
+        return $this->superglobals;
+    }
+
     /**
      * Gets the user's IP address.
      *
@@ -231,8 +253,12 @@ public function getEnv($index = null, $filter = null, $flags = null)
      */
     public function setGlobal(string $name, $value)
     {
+        // Keep BC with $globals array
         $this->globals[$name] = $value;
 
+        // Also update Superglobals via service
+        $this->getSuperglobals()->setGlobalArray($name, $value);
+
         return $this;
     }
 
@@ -342,35 +368,16 @@ public function fetchGlobal(string $name, $index = null, ?int $filter = null, $f
      * @param 'cookie'|'get'|'post'|'request'|'server' $name Superglobal name (lowercase)
      *
      * @return void
+     *
+     * @deprecated 4.7.0 No longer needs to be called explicitly. Used internally to maintain BC with $globals.
      */
     protected function populateGlobals(string $name)
     {
         if (! isset($this->globals[$name])) {
             $this->globals[$name] = [];
         }
 
-        // Don't populate ENV as it might contain
-        // sensitive data that we don't want to get logged.
-        switch ($name) {
-            case 'get':
-                $this->globals['get'] = $_GET;
-                break;
-
-            case 'post':
-                $this->globals['post'] = $_POST;
-                break;
-
-            case 'request':
-                $this->globals['request'] = $_REQUEST;
-                break;
-
-            case 'cookie':
-                $this->globals['cookie'] = $_COOKIE;
-                break;
-
-            case 'server':
-                $this->globals['server'] = $_SERVER;
-                break;
-        }
+        // Get data from Superglobals service instead of direct access
+        $this->globals[$name] = $this->getSuperglobals()->getGlobalArray($name);
     }
 }

system/Log/Logger.php

@@ -310,8 +310,8 @@ protected function interpolate($message, array $context = [])
             $replace['{' . $key . '}'] = $val;
         }
 
-        $replace['{post_vars}'] = '$_POST: ' . print_r($_POST, true);
-        $replace['{get_vars}']  = '$_GET: ' . print_r($_GET, true);
+        $replace['{post_vars}'] = '$_POST: ' . print_r(service('superglobals')->getPostArray(), true);
+        $replace['{get_vars}']  = '$_GET: ' . print_r(service('superglobals')->getGetArray(), true);
         $replace['{env}']       = ENVIRONMENT;
 
         // Allow us to log the file/line that we are logging from

system/Pager/Pager.php

@@ -279,7 +279,7 @@ public function getPageURI(?int $page = null, string $group = 'default', bool $r
         }
 
         if ($this->only !== null) {
-            $query = array_intersect_key($_GET, array_flip($this->only));
+            $query = array_intersect_key(service('superglobals')->getGetArray(), array_flip($this->only));
 
             if (! $segment) {
                 $query[$this->groups[$group]['pageSelector']] = $page;
@@ -411,8 +411,9 @@ protected function ensureGroup(string $group, ?int $perPage = null)
 
         $this->calculateCurrentPage($group);
 
-        if ($_GET !== []) {
-            $this->groups[$group]['uri'] = $this->groups[$group]['uri']->setQueryArray($_GET);
+        $get = service('superglobals')->getGetArray();
+        if ($get !== []) {
+            $this->groups[$group]['uri'] = $this->groups[$group]['uri']->setQueryArray($get);
         }
     }
 
@@ -433,7 +434,7 @@ protected function calculateCurrentPage(string $group)
         } else {
             $pageSelector = $this->groups[$group]['pageSelector'];
 
-            $page = (int) ($_GET[$pageSelector] ?? 1);
+            $page = (int) (service('superglobals')->get($pageSelector) ?? 1);
 
             $this->groups[$group]['currentPage'] = $page < 1 ? 1 : $page;
         }

system/Security/Security.php

@@ -281,10 +281,11 @@ private function removeTokenInRequest(RequestInterface $request): void
     {
         assert($request instanceof Request);
 
-        if (isset($_POST[$this->config->tokenName])) {
+        $superglobals = service('superglobals');
+        if ($superglobals->post($this->config->tokenName) !== null) {
             // We kill this since we're done and we don't want to pollute the POST array.
-            unset($_POST[$this->config->tokenName]);
-            $request->setGlobal('post', $_POST);
+            $superglobals->unsetPost($this->config->tokenName);
+            $request->setGlobal('post', $superglobals->getPostArray());
         } else {
             $body = $request->getBody() ?? '';
             $json = json_decode($body);