update tests

Author: michalsn

tests/system/CLI/CLITest.php

@@ -13,7 +13,9 @@
 
 namespace CodeIgniter\CLI;
 
+use CodeIgniter\Config\Services;
 use CodeIgniter\Exceptions\RuntimeException;
+use CodeIgniter\Superglobals;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\PhpStreamWrapper;
 use CodeIgniter\Test\StreamFilterTrait;
@@ -29,6 +31,13 @@ final class CLITest extends CIUnitTestCase
 {
     use StreamFilterTrait;
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Services::injectMock('superglobals', new Superglobals());
+    }
+
     public function testNew(): void
     {
         $actual = new CLI();
@@ -454,12 +463,12 @@ public function testWrap(): void
 
     public function testParseCommand(): void
     {
-        $_SERVER['argv'] = [
+        service('superglobals')->setServer('argv', [
             'ignored',
             'b',
             'c',
-        ];
-        $_SERVER['argc'] = 3;
+        ]);
+        service('superglobals')->setServer('argc', 3);
         CLI::init();
 
         $this->assertNull(CLI::getSegment(3));
@@ -473,7 +482,7 @@ public function testParseCommand(): void
 
     public function testParseCommandMixed(): void
     {
-        $_SERVER['argv'] = [
+        service('superglobals')->setServer('argv', [
             'ignored',
             'b',
             'c',
@@ -485,7 +494,7 @@ public function testParseCommandMixed(): void
             '--fix',
             '--opt-in',
             'sure',
-        ];
+        ]);
         CLI::init();
 
         $this->assertNull(CLI::getSegment(7));
@@ -502,14 +511,14 @@ public function testParseCommandMixed(): void
 
     public function testParseCommandOption(): void
     {
-        $_SERVER['argv'] = [
+        service('superglobals')->setServer('argv', [
             'ignored',
             'b',
             'c',
             '--parm',
             'pvalue',
             'd',
-        ];
+        ]);
         CLI::init();
 
         $this->assertSame(['parm' => 'pvalue'], CLI::getOptions());
@@ -524,7 +533,7 @@ public function testParseCommandOption(): void
 
     public function testParseCommandMultipleOptions(): void
     {
-        $_SERVER['argv'] = [
+        service('superglobals')->setServer('argv', [
             'ignored',
             'b',
             'c',
@@ -534,7 +543,7 @@ public function testParseCommandMultipleOptions(): void
             '--p2',
             '--p3',
             'value 3',
-        ];
+        ]);
         CLI::init();
 
         $this->assertSame(['parm' => 'pvalue', 'p2' => null, 'p3' => 'value 3'], CLI::getOptions());

tests/system/CLI/ConsoleTest.php

@@ -15,7 +15,9 @@
 
 use CodeIgniter\CodeIgniter;
 use CodeIgniter\Config\DotEnv;
+use CodeIgniter\Config\Services;
 use CodeIgniter\Events\Events;
+use CodeIgniter\Superglobals;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCLIConfig;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
@@ -34,12 +36,14 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        Services::injectMock('superglobals', new Superglobals());
+
         $env = new DotEnv(ROOTPATH);
         $env->load();
 
         // Set environment values that would otherwise stop the framework from functioning during tests.
-        if (! isset($_SERVER['app.baseURL'])) {
-            $_SERVER['app.baseURL'] = 'http://example.com/';
+        if (service('superglobals')->server('app.baseURL') === null) {
+            service('superglobals')->setServer('app.baseURL', 'http://example.com/');
         }
 
         $this->app = new MockCodeIgniter(new MockCLIConfig());
@@ -173,8 +177,8 @@ public function testHelpArgumentAndHelpOptionCombined(): void
      */
     protected function initCLI(...$command): void
     {
-        $_SERVER['argv'] = ['spark', ...$command];
-        $_SERVER['argc'] = count($_SERVER['argv']);
+        service('superglobals')->setServer('argv', ['spark', ...$command]);
+        service('superglobals')->setServer('argc', count(service('superglobals')->server('argv')));
 
         CLI::init();
     }

tests/system/Cache/ResponseCacheTest.php

@@ -13,13 +13,15 @@
 
 namespace CodeIgniter\Cache;
 
+use CodeIgniter\Config\Services;
 use CodeIgniter\Exceptions\RuntimeException;
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\HTTP\SiteURI;
 use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Superglobals;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCache;
 use Config\App;
@@ -35,6 +37,13 @@
 #[Group('Others')]
 final class ResponseCacheTest extends CIUnitTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Services::injectMock('superglobals', new Superglobals());
+    }
+
     /**
      * @param array<string, string> $query
      */
@@ -58,7 +67,7 @@ private function createIncomingRequest(string $uri = '', array $query = [], App
      */
     private function createCLIRequest(array $params = [], App $app = new App()): CLIRequest
     {
-        $_SERVER['argv'] = ['public/index.php', ...$params];
+        service('superglobals')->setServer('argv', ['public/index.php', ...$params]);
 
         $superglobals = service('superglobals');
         $superglobals->setServer('SCRIPT_NAME', 'public/index.php');