diff --git a/tests/_support/Config/Filters.php b/tests/_support/Config/Filters.php index af6170c9568f..f3960544f294 100644 --- a/tests/_support/Config/Filters.php +++ b/tests/_support/Config/Filters.php @@ -13,8 +13,11 @@ namespace Tests\Support\Config\Filters; +use Tests\Support\Filters\Customfilter; +use Tests\Support\Filters\RedirectFilter; + /** * @psalm-suppress UndefinedGlobalVariable */ -$filters->aliases['test-customfilter'] = \Tests\Support\Filters\Customfilter::class; -$filters->aliases['test-redirectfilter'] = \Tests\Support\Filters\RedirectFilter::class; +$filters->aliases['test-customfilter'] = Customfilter::class; +$filters->aliases['test-redirectfilter'] = RedirectFilter::class; diff --git a/tests/_support/Config/Registrar.php b/tests/_support/Config/Registrar.php index d2d6a0b0bc3a..8889021a2d00 100644 --- a/tests/_support/Config/Registrar.php +++ b/tests/_support/Config/Registrar.php @@ -134,10 +134,8 @@ public static function Database() // Under GitHub Actions, we can set an ENV var named 'DB' // so that we can test against multiple databases. - if ($group = getenv('DB')) { - if (! empty(self::$dbConfig[$group])) { - $config['tests'] = self::$dbConfig[$group]; - } + if (($group = getenv('DB')) && ! empty(self::$dbConfig[$group])) { + $config['tests'] = self::$dbConfig[$group]; } return $config; diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php index 78262afbe0fa..7a57d0cbd0cc 100644 --- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php +++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php @@ -51,7 +51,7 @@ public function up(): void // missing types : // TINYINT,MEDIUMINT,BIT,YEAR,BINARY , VARBINARY, TINYTEXT,LONGTEXT,YEAR,JSON,Spatial data types // id must be interger else SQLite3 error on not null for autoinc field - $data_type_fields = [ + $dataTypeFields = [ 'id' => ['type' => 'INTEGER', 'constraint' => 20, 'auto_increment' => true], 'type_varchar' => ['type' => 'VARCHAR', 'constraint' => 40, 'null' => true], 'type_char' => ['type' => 'CHAR', 'constraint' => 10, 'null' => true], @@ -77,26 +77,26 @@ public function up(): void if ($this->db->DBDriver === 'Postgre') { unset( - $data_type_fields['type_real'], - $data_type_fields['type_decimal'] + $dataTypeFields['type_real'], + $dataTypeFields['type_decimal'] ); } if ($this->db->DBDriver === 'SQLSRV') { - unset($data_type_fields['type_timestamp']); + unset($dataTypeFields['type_timestamp']); } if ($this->db->DBDriver === 'Postgre' || $this->db->DBDriver === 'SQLSRV') { unset( - $data_type_fields['type_enum'], - $data_type_fields['type_set'], - $data_type_fields['type_mediumtext'], - $data_type_fields['type_double'], - $data_type_fields['type_blob'] + $dataTypeFields['type_enum'], + $dataTypeFields['type_set'], + $dataTypeFields['type_mediumtext'], + $dataTypeFields['type_double'], + $dataTypeFields['type_blob'] ); } - $this->forge->addField($data_type_fields)->addKey('id', true)->createTable('type_test', true); + $this->forge->addField($dataTypeFields)->addKey('id', true)->createTable('type_test', true); // Empty Table $this->forge->addField([ diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php index cf1c459f8e6e..8811138ad275 100644 --- a/tests/_support/Database/Seeds/CITestSeeder.php +++ b/tests/_support/Database/Seeds/CITestSeeder.php @@ -107,7 +107,7 @@ public function run(): void 'type_time' => '2020-07-18T15:22:00.000+02:00', 'type_datetime' => '2020-06-18T05:12:24.000+02:00', 'type_timestamp' => '2019-07-18T21:53:21.000+02:00', - 'type_bigint' => 2342342, + 'type_bigint' => 2_342_342, 'type_boolean' => 1, ], ], @@ -178,11 +178,11 @@ public function run(): void unset($data['type_test'][0]['type_blob']); } - foreach ($data as $table => $dummy_data) { + foreach ($data as $table => $dummyData) { $this->db->table($table)->truncate(); - foreach ($dummy_data as $single_dummy_data) { - $this->db->table($table)->insert($single_dummy_data); + foreach ($dummyData as $singleDummyData) { + $this->db->table($table)->insert($singleDummyData); } } } diff --git a/tests/_support/Filters/Customfilter.php b/tests/_support/Filters/Customfilter.php index 9ce171580d45..ac8bce0f0271 100644 --- a/tests/_support/Filters/Customfilter.php +++ b/tests/_support/Filters/Customfilter.php @@ -13,10 +13,11 @@ namespace Tests\Support\Filters; +use CodeIgniter\Filters\FilterInterface; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; -class Customfilter implements \CodeIgniter\Filters\FilterInterface +class Customfilter implements FilterInterface { public function before(RequestInterface $request, $arguments = null) { diff --git a/tests/_support/Filters/RedirectFilter.php b/tests/_support/Filters/RedirectFilter.php index 66b61abc0e9f..8ab62eb665ca 100644 --- a/tests/_support/Filters/RedirectFilter.php +++ b/tests/_support/Filters/RedirectFilter.php @@ -13,10 +13,11 @@ namespace Tests\Support\Filters; +use CodeIgniter\Filters\FilterInterface; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; -class RedirectFilter implements \CodeIgniter\Filters\FilterInterface +class RedirectFilter implements FilterInterface { public function before(RequestInterface $request, $arguments = null) { diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php index e12d2ea78651..7088782274cb 100644 --- a/tests/_support/Log/Handlers/TestHandler.php +++ b/tests/_support/Log/Handlers/TestHandler.php @@ -13,13 +13,15 @@ namespace Tests\Support\Log\Handlers; +use CodeIgniter\Log\Handlers\FileHandler; + /** * Class TestHandler * * A simple LogHandler that stores the logs in memory. * Only used for testing purposes. */ -class TestHandler extends \CodeIgniter\Log\Handlers\FileHandler +class TestHandler extends FileHandler { /** * Local storage for logs. diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php index 854d0d3640da..37ae9fb407fd 100644 --- a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php +++ b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php @@ -13,7 +13,9 @@ namespace Tests\Support\MigrationTestMigrations\Database\Migrations; -class Migration_some_migration extends \CodeIgniter\Database\Migration +use CodeIgniter\Database\Migration; + +class Migration_some_migration extends Migration { public function up(): void { diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php index c2f7999f44b7..b35e3c35c997 100644 --- a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php +++ b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php @@ -13,7 +13,9 @@ namespace Tests\Support\MigrationTestMigrations\Database\Migrations; -class Migration_another_migration extends \CodeIgniter\Database\Migration +use CodeIgniter\Database\Migration; + +class Migration_another_migration extends Migration { public function up(): void { diff --git a/tests/_support/Models/EntityModel.php b/tests/_support/Models/EntityModel.php index b8a5df4cdbd2..9bf5500bd357 100644 --- a/tests/_support/Models/EntityModel.php +++ b/tests/_support/Models/EntityModel.php @@ -18,7 +18,7 @@ class EntityModel extends Model { protected $table = 'job'; - protected $returnType = '\Tests\Support\Models\SimpleEntity'; + protected $returnType = '\\' . SimpleEntity::class; protected $useSoftDeletes = false; protected $dateFormat = 'int'; protected $deletedField = 'deleted_at'; diff --git a/tests/_support/Models/UserObjModel.php b/tests/_support/Models/UserObjModel.php index abdc48ba3f57..bcdade697a7b 100644 --- a/tests/_support/Models/UserObjModel.php +++ b/tests/_support/Models/UserObjModel.php @@ -14,6 +14,7 @@ namespace Tests\Support\Models; use CodeIgniter\Model; +use Tests\Support\Entity\User; class UserObjModel extends Model { @@ -24,7 +25,7 @@ class UserObjModel extends Model 'country', 'deleted_at', ]; - protected $returnType = \Tests\Support\Entity\User::class; + protected $returnType = User::class; protected $useSoftDeletes = true; protected $dateFormat = 'datetime'; } diff --git a/tests/_support/Publishers/TestPublisher.php b/tests/_support/Publishers/TestPublisher.php index 6458e8b3c7b0..f8c2bf6a01ec 100644 --- a/tests/_support/Publishers/TestPublisher.php +++ b/tests/_support/Publishers/TestPublisher.php @@ -19,10 +19,8 @@ final class TestPublisher extends Publisher { /** * Return value for publish() - * - * @var bool */ - private static $result = true; + private static bool $result = true; /** * Base path to use for the source. diff --git a/tests/_support/Services/Translation/TranslationNested/TranslationFour.php b/tests/_support/Services/Translation/TranslationNested/TranslationFour.php index f94724ddfd43..68c41c40c6e7 100644 --- a/tests/_support/Services/Translation/TranslationNested/TranslationFour.php +++ b/tests/_support/Services/Translation/TranslationNested/TranslationFour.php @@ -17,16 +17,16 @@ class TranslationFour { public function list() { - $translationOne1 = lang('TranslationOne.title'); - $translationOne5 = lang('TranslationOne.last_operation_success'); + lang('TranslationOne.title'); + lang('TranslationOne.last_operation_success'); - $translationThree1 = lang('TranslationThree.alerts.created'); - $translationThree2 = lang('TranslationThree.alerts.failed_insert'); + lang('TranslationThree.alerts.created'); + lang('TranslationThree.alerts.failed_insert'); - $translationThree5 = lang('TranslationThree.formFields.new.name'); - $translationThree7 = lang('TranslationThree.formFields.new.short_tag'); + lang('TranslationThree.formFields.new.name'); + lang('TranslationThree.formFields.new.short_tag'); - $translationFour1 = lang('Translation-Four.dashed.key-with-dash'); - $translationFour2 = lang('Translation-Four.dashed.key-with-dash-two'); + lang('Translation-Four.dashed.key-with-dash'); + lang('Translation-Four.dashed.key-with-dash-two'); } } diff --git a/tests/_support/Services/Translation/TranslationOne.php b/tests/_support/Services/Translation/TranslationOne.php index a2cbd8ffd8e5..b913700731b5 100644 --- a/tests/_support/Services/Translation/TranslationOne.php +++ b/tests/_support/Services/Translation/TranslationOne.php @@ -17,22 +17,22 @@ class TranslationOne { public function list() { - $translationOne1 = lang('TranslationOne.title'); - $translationOne2 = lang('TranslationOne.DESCRIPTION'); - $translationOne3 = lang('TranslationOne.metaTags'); - $translationOne4 = lang('TranslationOne.Copyright'); - $translationOne5 = lang('TranslationOne.last_operation_success'); + lang('TranslationOne.title'); + lang('TranslationOne.DESCRIPTION'); + lang('TranslationOne.metaTags'); + lang('TranslationOne.Copyright'); + lang('TranslationOne.last_operation_success'); - $translationThree1 = lang('TranslationThree.alerts.created'); - $translationThree2 = lang('TranslationThree.alerts.failed_insert'); - $translationThree3 = lang('TranslationThree.alerts.Updated'); - $translationThree4 = lang('TranslationThree.alerts.DELETED'); + lang('TranslationThree.alerts.created'); + lang('TranslationThree.alerts.failed_insert'); + lang('TranslationThree.alerts.Updated'); + lang('TranslationThree.alerts.DELETED'); - $translationThree5 = lang('TranslationThree.formFields.new.name'); - $translationThree6 = lang('TranslationThree.formFields.new.TEXT'); - $translationThree7 = lang('TranslationThree.formFields.new.short_tag'); - $translationThree8 = lang('TranslationThree.formFields.edit.name'); - $translationThree9 = lang('TranslationThree.formFields.edit.TEXT'); - $translationThree10 = lang('TranslationThree.formFields.edit.short_tag'); + lang('TranslationThree.formFields.new.name'); + lang('TranslationThree.formFields.new.TEXT'); + lang('TranslationThree.formFields.new.short_tag'); + lang('TranslationThree.formFields.edit.name'); + lang('TranslationThree.formFields.edit.TEXT'); + lang('TranslationThree.formFields.edit.short_tag'); } } diff --git a/tests/_support/Services/Translation/TranslationThree.php b/tests/_support/Services/Translation/TranslationThree.php index 5a9f76c245f6..d3ea6c5ec90b 100644 --- a/tests/_support/Services/Translation/TranslationThree.php +++ b/tests/_support/Services/Translation/TranslationThree.php @@ -17,23 +17,23 @@ class TranslationThree { public function list() { - $translationOne1 = lang('TranslationOne.title'); - $translationOne2 = lang('TranslationOne.DESCRIPTION'); - $translationOne6 = lang('TranslationOne.subTitle'); - $translationOne7 = lang('TranslationOne.overflow_style'); + lang('TranslationOne.title'); + lang('TranslationOne.DESCRIPTION'); + lang('TranslationOne.subTitle'); + lang('TranslationOne.overflow_style'); - $translationThree1 = lang('TranslationThree.alerts.created'); - $translationThree2 = lang('TranslationThree.alerts.failed_insert'); + lang('TranslationThree.alerts.created'); + lang('TranslationThree.alerts.failed_insert'); - $translationThree5 = lang('TranslationThree.formFields.new.name'); - $translationThree6 = lang('TranslationThree.formFields.new.TEXT'); - $translationThree7 = lang('TranslationThree.formFields.new.short_tag'); + lang('TranslationThree.formFields.new.name'); + lang('TranslationThree.formFields.new.TEXT'); + lang('TranslationThree.formFields.new.short_tag'); - $translationThree11 = lang('TranslationThree.alerts.CANCELED'); - $translationThree12 = lang('TranslationThree.alerts.missing_keys'); + lang('TranslationThree.alerts.CANCELED'); + lang('TranslationThree.alerts.missing_keys'); - $translationThree13 = lang('TranslationThree.formErrors.edit.empty_name'); - $translationThree14 = lang('TranslationThree.formErrors.edit.INVALID_TEXT'); - $translationThree15 = lang('TranslationThree.formErrors.edit.missing_short_tag'); + lang('TranslationThree.formErrors.edit.empty_name'); + lang('TranslationThree.formErrors.edit.INVALID_TEXT'); + lang('TranslationThree.formErrors.edit.missing_short_tag'); } } diff --git a/tests/_support/Services/Translation/TranslationTwo.php b/tests/_support/Services/Translation/TranslationTwo.php index 82cccc551a2e..8272ec6271a8 100644 --- a/tests/_support/Services/Translation/TranslationTwo.php +++ b/tests/_support/Services/Translation/TranslationTwo.php @@ -17,24 +17,21 @@ class TranslationTwo { public function list() { - $langKey = 'TranslationTwo.error_key'; - // Error language keys - $translationError1 = lang('TranslationTwo'); - $translationError2 = lang(' '); - $translationError3 = lang(''); - $translationError4 = lang('.invalid_key'); - $translationError5 = lang('TranslationTwo.'); - $translationError6 = lang('TranslationTwo...'); - $translationError7 = lang('..invalid_nested_key..'); - - $copyTranslationError1 = lang('TranslationTwo'); - $copyTranslationError2 = lang(' '); - $copyTranslationError3 = lang(''); - $copyTranslationError4 = lang('.invalid_key'); - $copyTranslationError5 = lang('TranslationTwo.'); - $copyTranslationError6 = lang('TranslationTwo...'); - $copyTranslationError7 = lang('..invalid_nested_key..'); + lang('TranslationTwo'); + lang(' '); + lang(''); + lang('.invalid_key'); + lang('TranslationTwo.'); + lang('TranslationTwo...'); + lang('..invalid_nested_key..'); + lang('TranslationTwo'); + lang(' '); + lang(''); + lang('.invalid_key'); + lang('TranslationTwo.'); + lang('TranslationTwo...'); + lang('..invalid_nested_key..'); // Empty in comments lang('') lang(' ') } } diff --git a/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php b/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php index 312eb0853c9d..861d6ede713f 100644 --- a/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php +++ b/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php @@ -1,5 +1,7 @@