reorder superglobals params

Author: michalsn

system/Config/Services.php

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

system/Superglobals.php

@@ -65,23 +65,23 @@ final class Superglobals
      * @param array<string, array|string>|null           $get
      * @param array<string, array|string>|null           $post
      * @param array<string, array|string>|null           $cookie
-     * @param array<string, array|string>|null           $request
      * @param array<string, array<string, mixed>>|null   $files
+     * @param array<string, array|string>|null           $request
      */
     public function __construct(
         ?array $server = null,
         ?array $get = null,
         ?array $post = null,
         ?array $cookie = null,
-        ?array $request = null,
         ?array $files = null,
+        ?array $request = null,
     ) {
         $this->server  = $server ?? $_SERVER;
         $this->get     = $get ?? $_GET;
         $this->post    = $post ?? $_POST;
         $this->cookie  = $cookie ?? $_COOKIE;
-        $this->request = $request ?? $_REQUEST;
         $this->files   = $files ?? $_FILES;
+        $this->request = $request ?? $_REQUEST;
     }
 
     /**

tests/system/SuperglobalsTest.php

@@ -29,7 +29,7 @@ protected function setUp(): void
         parent::setUp();
 
         // Clear superglobals before each test
-        $_SERVER = $_GET = $_POST = $_COOKIE = $_REQUEST = $_FILES = [];
+        $_SERVER = $_GET = $_POST = $_COOKIE = $_FILES = $_REQUEST = [];
 
         $this->superglobals = new Superglobals();
     }
@@ -442,7 +442,7 @@ public function testConstructorWithCustomArrays(): void
             ],
         ];
 
-        $superglobals = new Superglobals($server, $get, $post, $cookie, $request, $files);
+        $superglobals = new Superglobals($server, $get, $post, $cookie, $files, $request);
 
         $this->assertSame('server_value', $superglobals->server('SERVER_KEY'));
         $this->assertSame('get_value', $superglobals->get('get_key'));