Merge pull request #5259 from paulbalandan/reset-services

Replace explicit calls to `Services::reset()` in tests

Author: kenjis

tests/system/CodeIgniterTest.php

@@ -36,7 +36,7 @@ final class CodeIgniterTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 

tests/system/CommonHelperTest.php

@@ -32,7 +32,7 @@ final class CommonHelperTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
-        Services::reset();
+        $this->resetServices();
         parent::setUp();
         $this->cleanUpDummyHelpers();
     }
@@ -41,7 +41,7 @@ protected function tearDown(): void
     {
         parent::tearDown();
         $this->cleanUpDummyHelpers();
-        Services::reset();
+        $this->resetServices();
     }
 
     private function createDummyHelpers(): void

tests/system/Config/ServicesTest.php

@@ -64,7 +64,7 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $_SERVER = $this->original;
-        Services::reset();
+        $this->resetServices();
     }
 
     public function testCanReplaceFrameworkServices()

tests/system/Filters/FiltersTest.php

@@ -40,7 +40,7 @@ final class FiltersTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        Services::reset();
+        $this->resetServices();
 
         $defaults = [
             'Config'        => APPPATH . 'Config',

tests/system/HTTP/CURLRequestTest.php

@@ -32,7 +32,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Services::reset();
+        $this->resetServices();
         $this->request = $this->getRequest();
     }
 

tests/system/HTTP/URITest.php

@@ -861,7 +861,7 @@ public function testSetBadSegmentSilent()
 
     public function testBasedNoIndex()
     {
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/ci/v4/controller/method';
@@ -888,7 +888,7 @@ public function testBasedNoIndex()
 
     public function testBasedWithIndex()
     {
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/ci/v4/index.php/controller/method';
@@ -915,7 +915,7 @@ public function testBasedWithIndex()
 
     public function testForceGlobalSecureRequests()
     {
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/ci/v4/controller/method';

tests/system/RESTful/ResourceControllerTest.php

@@ -54,7 +54,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 

tests/system/RESTful/ResourcePresenterTest.php

@@ -48,7 +48,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';