codeigniter4 · paulbalandan · Jun 25, 2021 · Jun 24, 2021 · Jun 24, 2021 · Jun 24, 2021
diff --git a/admin/module/tests/_support/DatabaseTestCase.php b/admin/module/tests/_support/DatabaseTestCase.php
@@ -45,14 +45,14 @@ final class DatabaseTestCase extends CIUnitTestCase
      */
     protected $namespace = 'Tests\Support';
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
         // Extra code to run before each test
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 

diff --git a/admin/module/tests/_support/SessionTestCase.php b/admin/module/tests/_support/SessionTestCase.php
@@ -17,7 +17,7 @@ final class SessionTestCase extends CIUnitTestCase
      */
     protected $session;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/admin/module/tests/database/ExampleDatabaseTest.php b/admin/module/tests/database/ExampleDatabaseTest.php
@@ -7,7 +7,7 @@
  */
 final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/admin/module/tests/session/ExampleSessionTest.php b/admin/module/tests/session/ExampleSessionTest.php
@@ -5,7 +5,7 @@
  */
 final class ExampleSessionTest extends \Tests\Support\SessionTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }

diff --git a/admin/module/tests/unit/ExampleTest.php b/admin/module/tests/unit/ExampleTest.php
@@ -5,7 +5,7 @@
  */
 final class ExampleTest extends \CodeIgniter\Test\CIUnitTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }

diff --git a/admin/starter/tests/_support/DatabaseTestCase.php b/admin/starter/tests/_support/DatabaseTestCase.php
@@ -45,14 +45,14 @@ final class DatabaseTestCase extends CIUnitTestCase
      */
     protected $namespace = 'Tests\Support';
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
         // Extra code to run before each test
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 

diff --git a/admin/starter/tests/_support/SessionTestCase.php b/admin/starter/tests/_support/SessionTestCase.php
@@ -17,7 +17,7 @@ final class SessionTestCase extends CIUnitTestCase
      */
     protected $session;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/admin/starter/tests/database/ExampleDatabaseTest.php b/admin/starter/tests/database/ExampleDatabaseTest.php
@@ -7,7 +7,7 @@
  */
 final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/admin/starter/tests/session/ExampleSessionTest.php b/admin/starter/tests/session/ExampleSessionTest.php
@@ -5,7 +5,7 @@
  */
 final class ExampleSessionTest extends \Tests\Support\SessionTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }

diff --git a/admin/starter/tests/unit/HealthTest.php b/admin/starter/tests/unit/HealthTest.php
@@ -7,7 +7,7 @@
  */
 final class HealthTest extends \CodeIgniter\Test\CIUnitTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }

diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
         $this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->stream_filter);
     }

diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
@@ -45,7 +45,7 @@ protected function setUp(): void
         $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
     }

diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void
         $this->app = new MockCodeIgniter(new MockCLIConfig());
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->stream_filter);
     }

diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         $this->config->storePath .= self::$directory;
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         if (is_dir($this->config->storePath)) {
             chmod($this->config->storePath, 0777);

diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void
         $this->fileHandler->initialize();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 

diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
         $this->memcachedHandler->initialize();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         foreach (self::getKeyArray() as $key) {
             $this->memcachedHandler->delete($key);

diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
         $this->PredisHandler->initialize();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         foreach (self::getKeyArray() as $key) {
             $this->PredisHandler->delete($key);

diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
         $this->redisHandler->initialize();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         foreach (self::getKeyArray() as $key) {
             $this->redisHandler->delete($key);

diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
@@ -37,7 +37,7 @@ protected function setUp(): void
         $this->codeigniter = new MockCodeIgniter($config);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 

diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         Services::injectMock('cache', CacheFactory::getHandler(config('Cache')));
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
     }

diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         Services::injectMock('cache', CacheFactory::getHandler(config('Cache')));
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
 

diff --git a/tests/system/Commands/SessionsCommandsTest.php b/tests/system/Commands/SessionsCommandsTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
         $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
 

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -111,7 +111,7 @@ public function testRedirectReturnsRedirectResponse()
         \CodeIgniter\Services::injectMock('routes', $routes);
 
         $routes->add('home/base', 'Controller::index', ['as' => 'base']);
-        $response->method('redirect')->will($this->returnArgument(0));
+        $response->method('redirect')->willReturnArgument(0);
 
         $this->assertInstanceOf(RedirectResponse::class, redirect('base'));
     }

diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
@@ -52,7 +52,7 @@ protected function setUp(): void
         $this->config   = new App();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $_SERVER = $this->original;
         Services::reset();

diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
@@ -45,7 +45,7 @@ final class DatabaseTestCaseMigrationOnce1Test extends CIUnitTestCase
         'Tests\Support\MigrationTestMigrations',
     ];
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
 

diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
@@ -44,7 +44,7 @@ final class DatabaseTestCaseMigrationOnce2Test extends CIUnitTestCase
         'Tests\Support\MigrationTestMigrations',
     ];
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
 

diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php
@@ -49,7 +49,7 @@ final class DatabaseTestCaseTest extends CIUnitTestCase
         'Tests\Support\MigrationTestMigrations',
     ];
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         if (! self::$loaded) {
             Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');

diff --git a/tests/system/Database/Live/DEBugTest.php b/tests/system/Database/Live/DEBugTest.php
@@ -30,7 +30,7 @@ public function testDBDebugFalse()
         $this->assertFalse($result);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $this->setPrivateProperty($this->db, 'DBDebug', true);
         parent::tearDown();

diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php
@@ -22,7 +22,7 @@ final class GetNumRowsTest extends CIUnitTestCase
      *
      * @see \CodeIgniter\Test\CIDatabaseTestCase::setUp()
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }
@@ -33,7 +33,7 @@ public function setUp(): void
      *
      * @see \CodeIgniter\Test\CIDatabaseTestCase::tearDown()
      */
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
     }

diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php
@@ -15,7 +15,7 @@ final class PretendTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         // We share `$this->db` in testing, so we need to restore the state.
         $this->db->pretend(false);

diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -40,7 +40,7 @@ final class AlterTableTest extends CIUnitTestCase
      */
     protected $forge;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -29,7 +29,7 @@ final class MigrationRunnerTest extends CIUnitTestCase
     protected $start;
     protected $config;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php
@@ -13,7 +13,7 @@ final class MigrationTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }

diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->file  = new File($this->start . 'able/apple.php');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 

diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
@@ -13,7 +13,7 @@
  */
 final class DownloadResponseTest extends CIUnitTestCase
 {
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         if (isset($_SERVER['HTTP_USER_AGENT'])) {
             unset($_SERVER['HTTP_USER_AGENT']);

diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
         $_FILES = [];
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
         $this->root = null;

diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
 
     //--------------------------------------------------------------------
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $this->message = null;
         unset($this->message);

diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
 
     //--------------------------------------------------------------------
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $this->request = $this->negotiate = null;
         unset($this->request, $this->negotiate);

diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
         $this->server = $_SERVER;
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $_SERVER = $this->server;
         Factories::reset('config');

diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
 
     //--------------------------------------------------------------------
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         Factories::reset('config');
     }

diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php
@@ -34,7 +34,7 @@ public function testStripImageTags()
         $this->assertEquals('http://example.com/spacer.gif', strip_image_tags('<img src="http://example.com/spacer.gif" alt="Who needs CSS when you have a spacer.gif?" />'));
     }
 
-    public function test_encode_php_tags()
+    public function testEncodePhpTags()
     {
         $this->assertEquals('&lt;? echo $foo; ?&gt;', encode_php_tags('<? echo $foo; ?>'));
     }