test: refactor files in tests/_support/ by rector#8307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 3 commits into from
Dec 8, 2023
Merged

test: refactor files in tests/_support/ by rector #8307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ff0cc0
test: add `declare(strict_types=1)`
kenjis Dec 7, 2023
8ff48df
test: refactor by rector
kenjis Dec 8, 2023
797c5d6
chore: apply rector to files in tests/_support/
kenjis Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion rector.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,13 +80,16 @@
__DIR__ . '/system/ThirdParty',
__DIR__ . '/tests/system/Config/fixtures',
__DIR__ . '/tests/system/Filters/fixtures',
__DIR__ . '/tests/_support',
__DIR__ . '/tests/_support/Commands/Foobar.php',
__DIR__ . '/tests/_support/View',

JsonThrowOnErrorRector::class,
YieldDataProviderRector::class,

RemoveUnusedPrivateMethodRector::class => [
// private method called via getPrivateMethodInvoker
__DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
__DIR__ . '/tests/_support/Test/TestForReflectionHelper.php',
],

RemoveUnusedConstructorParamRector::class => [
Expand Down
7 changes: 5 additions & 2 deletions tests/_support/Config/Filters.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
6 changes: 2 additions & 4 deletions tests/_support/Config/Registrar.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
20 changes: 10 additions & 10 deletions tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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],
Expand All@@ -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([
Expand Down
8 changes: 4 additions & 4 deletions tests/_support/Database/Seeds/CITestSeeder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
],
],
Expand DownExpand Up@@ -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);
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions tests/_support/Entity/Cast/CastBinaryUUID.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* This file is part of CodeIgniter 4 framework.
*
Expand Down
2 changes: 2 additions & 0 deletions tests/_support/Entity/UUID.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* This file is part of CodeIgniter 4 framework.
*
Expand Down
3 changes: 2 additions & 1 deletion tests/_support/Filters/Customfilter.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
{
Expand Down
3 changes: 2 additions & 1 deletion tests/_support/Filters/RedirectFilter.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
{
Expand Down
4 changes: 3 additions & 1 deletion tests/_support/Log/Handlers/TestHandler.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down
4 changes: 3 additions & 1 deletion ..._support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
{
Expand Down
4 changes: 3 additions & 1 deletion ...pport/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion tests/_support/Models/EntityModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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';
Expand Down
2 changes: 2 additions & 0 deletions tests/_support/Models/UUIDPkeyModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* This file is part of CodeIgniter 4 framework.
*
Expand Down
3 changes: 2 additions & 1 deletion tests/_support/Models/UserObjModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
namespace Tests\Support\Models;

use CodeIgniter\Model;
use Tests\Support\Entity\User;

class UserObjModel extends Model
{
Expand All@@ -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';
}
2 changes: 2 additions & 0 deletions tests/_support/Models/UserTimestampModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* This file is part of CodeIgniter 4 framework.
*
Expand Down
4 changes: 1 addition & 3 deletions tests/_support/Publishers/TestPublisher.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down
16 changes: 8 additions & 8 deletions tests/_support/Services/Translation/TranslationNested/TranslationFour.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
}
}
30 changes: 15 additions & 15 deletions tests/_support/Services/Translation/TranslationOne.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
}
}
28 changes: 14 additions & 14 deletions tests/_support/Services/Translation/TranslationThree.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
}
}
31 changes: 14 additions & 17 deletions tests/_support/Services/Translation/TranslationTwo.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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(' ')
}
}
2 changes: 2 additions & 0 deletions tests/_support/Test/TestForReflectionHelper.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* This file is part of CodeIgniter 4 framework.
*
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
test: refactor files in tests/_support/ by rector#8307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 3 commits into

from

Dec 8, 2023
 Merged


test: refactor files in tests/_support/ by rector
#8307
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8ff0cc0

test: add `declare(strict_types=1)`


kenjis Dec 7, 2023
8ff48df

test: refactor by rector


kenjis Dec 8, 2023
797c5d6

chore: apply rector to files in tests/_support/


kenjis Dec 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,13 +80,16 @@
 __DIR__ . '/system/ThirdParty',
 __DIR__ . '/tests/system/Config/fixtures',
 __DIR__ . '/tests/system/Filters/fixtures',
 __DIR__ . '/tests/_support',
 __DIR__ . '/tests/_support/Commands/Foobar.php',
 __DIR__ . '/tests/_support/View',

 JsonThrowOnErrorRector::class,
 YieldDataProviderRector::class,

 RemoveUnusedPrivateMethodRector::class => [
 // private method called via getPrivateMethodInvoker
 __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
 __DIR__ . '/tests/_support/Test/TestForReflectionHelper.php',
 ],

 RemoveUnusedConstructorParamRector::class => [
Expand Down

7 changes: 5 additions & 2 deletions
tests/_support/Config/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

6 changes: 2 additions & 4 deletions
tests/_support/Config/Registrar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

20 changes: 10 additions & 10 deletions
tests/_support/Database/Migrations/20160428212500_Create_test_tables.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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],
Expand All@@ -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([
Expand Down

8 changes: 4 additions & 4 deletions
tests/_support/Database/Seeds/CITestSeeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
 ],
 ],
Expand DownExpand Up@@ -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);
 }
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/Cast/CastBinaryUUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/UUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/Customfilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/RedirectFilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

4 changes: 3 additions & 1 deletion
tests/_support/Log/Handlers/TestHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

4 changes: 3 additions & 1 deletion
..._support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

4 changes: 3 additions & 1 deletion
...pport/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/_support/Models/EntityModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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';
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Models/UUIDPkeyModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Models/UserObjModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
namespace Tests\Support\Models;

use CodeIgniter\Model;
use Tests\Support\Entity\User;

class UserObjModel extends Model
{
Expand All@@ -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';
}

2 changes: 2 additions & 0 deletions
tests/_support/Models/UserTimestampModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

4 changes: 1 addition & 3 deletions
tests/_support/Publishers/TestPublisher.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

16 changes: 8 additions & 8 deletions
tests/_support/Services/Translation/TranslationNested/TranslationFour.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

30 changes: 15 additions & 15 deletions
tests/_support/Services/Translation/TranslationOne.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

28 changes: 14 additions & 14 deletions
tests/_support/Services/Translation/TranslationThree.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

31 changes: 14 additions & 17 deletions
tests/_support/Services/Translation/TranslationTwo.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(' ')
 }
}

2 changes: 2 additions & 0 deletions
tests/_support/Test/TestForReflectionHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test: refactor files in tests/_support/ by rector#8307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 3 commits into

from

Dec 8, 2023
 Merged


test: refactor files in tests/_support/ by rector
#8307
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8ff0cc0

test: add `declare(strict_types=1)`


kenjis Dec 7, 2023
8ff48df

test: refactor by rector


kenjis Dec 8, 2023
797c5d6

chore: apply rector to files in tests/_support/


kenjis Dec 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,13 +80,16 @@
 __DIR__ . '/system/ThirdParty',
 __DIR__ . '/tests/system/Config/fixtures',
 __DIR__ . '/tests/system/Filters/fixtures',
 __DIR__ . '/tests/_support',
 __DIR__ . '/tests/_support/Commands/Foobar.php',
 __DIR__ . '/tests/_support/View',

 JsonThrowOnErrorRector::class,
 YieldDataProviderRector::class,

 RemoveUnusedPrivateMethodRector::class => [
 // private method called via getPrivateMethodInvoker
 __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
 __DIR__ . '/tests/_support/Test/TestForReflectionHelper.php',
 ],

 RemoveUnusedConstructorParamRector::class => [
Expand Down

7 changes: 5 additions & 2 deletions
tests/_support/Config/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

6 changes: 2 additions & 4 deletions
tests/_support/Config/Registrar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

20 changes: 10 additions & 10 deletions
tests/_support/Database/Migrations/20160428212500_Create_test_tables.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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],
Expand All@@ -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([
Expand Down

8 changes: 4 additions & 4 deletions
tests/_support/Database/Seeds/CITestSeeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
 ],
 ],
Expand DownExpand Up@@ -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);
 }
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/Cast/CastBinaryUUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/UUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/Customfilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/RedirectFilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

4 changes: 3 additions & 1 deletion
tests/_support/Log/Handlers/TestHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

4 changes: 3 additions & 1 deletion
..._support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

4 changes: 3 additions & 1 deletion
...pport/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/_support/Models/EntityModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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';
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Models/UUIDPkeyModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Models/UserObjModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
namespace Tests\Support\Models;

use CodeIgniter\Model;
use Tests\Support\Entity\User;

class UserObjModel extends Model
{
Expand All@@ -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';
}

2 changes: 2 additions & 0 deletions
tests/_support/Models/UserTimestampModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

4 changes: 1 addition & 3 deletions
tests/_support/Publishers/TestPublisher.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

16 changes: 8 additions & 8 deletions
tests/_support/Services/Translation/TranslationNested/TranslationFour.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

30 changes: 15 additions & 15 deletions
tests/_support/Services/Translation/TranslationOne.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

28 changes: 14 additions & 14 deletions
tests/_support/Services/Translation/TranslationThree.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

31 changes: 14 additions & 17 deletions
tests/_support/Services/Translation/TranslationTwo.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(' ')
 }
}

2 changes: 2 additions & 0 deletions
tests/_support/Test/TestForReflectionHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test: refactor files in tests/_support/ by rector#8307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 3 commits into

from

Dec 8, 2023
 Merged


test: refactor files in tests/_support/ by rector
#8307
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8ff0cc0

test: add `declare(strict_types=1)`


kenjis Dec 7, 2023
8ff48df

test: refactor by rector


kenjis Dec 8, 2023
797c5d6

chore: apply rector to files in tests/_support/


kenjis Dec 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,13 +80,16 @@
 __DIR__ . '/system/ThirdParty',
 __DIR__ . '/tests/system/Config/fixtures',
 __DIR__ . '/tests/system/Filters/fixtures',
 __DIR__ . '/tests/_support',
 __DIR__ . '/tests/_support/Commands/Foobar.php',
 __DIR__ . '/tests/_support/View',

 JsonThrowOnErrorRector::class,
 YieldDataProviderRector::class,

 RemoveUnusedPrivateMethodRector::class => [
 // private method called via getPrivateMethodInvoker
 __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
 __DIR__ . '/tests/_support/Test/TestForReflectionHelper.php',
 ],

 RemoveUnusedConstructorParamRector::class => [
Expand Down

7 changes: 5 additions & 2 deletions
tests/_support/Config/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

6 changes: 2 additions & 4 deletions
tests/_support/Config/Registrar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

20 changes: 10 additions & 10 deletions
tests/_support/Database/Migrations/20160428212500_Create_test_tables.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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],
Expand All@@ -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([
Expand Down

8 changes: 4 additions & 4 deletions
tests/_support/Database/Seeds/CITestSeeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
 ],
 ],
Expand DownExpand Up@@ -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);
 }
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/Cast/CastBinaryUUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/UUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/Customfilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/RedirectFilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

4 changes: 3 additions & 1 deletion
tests/_support/Log/Handlers/TestHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

4 changes: 3 additions & 1 deletion
..._support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

4 changes: 3 additions & 1 deletion
...pport/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/_support/Models/EntityModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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';
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Models/UUIDPkeyModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Models/UserObjModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
namespace Tests\Support\Models;

use CodeIgniter\Model;
use Tests\Support\Entity\User;

class UserObjModel extends Model
{
Expand All@@ -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';
}

2 changes: 2 additions & 0 deletions
tests/_support/Models/UserTimestampModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

4 changes: 1 addition & 3 deletions
tests/_support/Publishers/TestPublisher.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

16 changes: 8 additions & 8 deletions
tests/_support/Services/Translation/TranslationNested/TranslationFour.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

30 changes: 15 additions & 15 deletions
tests/_support/Services/Translation/TranslationOne.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

28 changes: 14 additions & 14 deletions
tests/_support/Services/Translation/TranslationThree.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

31 changes: 14 additions & 17 deletions
tests/_support/Services/Translation/TranslationTwo.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(' ')
 }
}

2 changes: 2 additions & 0 deletions
tests/_support/Test/TestForReflectionHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
test: refactor files in tests/_support/ by rector#8307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 3 commits into

from

Dec 8, 2023
 Merged


test: refactor files in tests/_support/ by rector
#8307
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8ff0cc0

test: add `declare(strict_types=1)`


kenjis Dec 7, 2023
8ff48df

test: refactor by rector


kenjis Dec 8, 2023
797c5d6

chore: apply rector to files in tests/_support/


kenjis Dec 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,13 +80,16 @@
 __DIR__ . '/system/ThirdParty',
 __DIR__ . '/tests/system/Config/fixtures',
 __DIR__ . '/tests/system/Filters/fixtures',
 __DIR__ . '/tests/_support',
 __DIR__ . '/tests/_support/Commands/Foobar.php',
 __DIR__ . '/tests/_support/View',

 JsonThrowOnErrorRector::class,
 YieldDataProviderRector::class,

 RemoveUnusedPrivateMethodRector::class => [
 // private method called via getPrivateMethodInvoker
 __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
 __DIR__ . '/tests/_support/Test/TestForReflectionHelper.php',
 ],

 RemoveUnusedConstructorParamRector::class => [
Expand Down

7 changes: 5 additions & 2 deletions
tests/_support/Config/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

6 changes: 2 additions & 4 deletions
tests/_support/Config/Registrar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

20 changes: 10 additions & 10 deletions
tests/_support/Database/Migrations/20160428212500_Create_test_tables.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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],
Expand All@@ -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([
Expand Down

8 changes: 4 additions & 4 deletions
tests/_support/Database/Seeds/CITestSeeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
 ],
 ],
Expand DownExpand Up@@ -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);
 }
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/Cast/CastBinaryUUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/UUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/Customfilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/RedirectFilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

4 changes: 3 additions & 1 deletion
tests/_support/Log/Handlers/TestHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

4 changes: 3 additions & 1 deletion
..._support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

4 changes: 3 additions & 1 deletion
...pport/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/_support/Models/EntityModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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';
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Models/UUIDPkeyModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Models/UserObjModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
namespace Tests\Support\Models;

use CodeIgniter\Model;
use Tests\Support\Entity\User;

class UserObjModel extends Model
{
Expand All@@ -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';
}

2 changes: 2 additions & 0 deletions
tests/_support/Models/UserTimestampModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

4 changes: 1 addition & 3 deletions
tests/_support/Publishers/TestPublisher.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

16 changes: 8 additions & 8 deletions
tests/_support/Services/Translation/TranslationNested/TranslationFour.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

30 changes: 15 additions & 15 deletions
tests/_support/Services/Translation/TranslationOne.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

28 changes: 14 additions & 14 deletions
tests/_support/Services/Translation/TranslationThree.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

31 changes: 14 additions & 17 deletions
tests/_support/Services/Translation/TranslationTwo.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(' ')
 }
}

2 changes: 2 additions & 0 deletions
tests/_support/Test/TestForReflectionHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test: refactor files in tests/_support/ by rector#8307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 3 commits into

from

Dec 8, 2023
 Merged


test: refactor files in tests/_support/ by rector
#8307
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8ff0cc0

test: add `declare(strict_types=1)`


kenjis Dec 7, 2023
8ff48df

test: refactor by rector


kenjis Dec 8, 2023
797c5d6

chore: apply rector to files in tests/_support/


kenjis Dec 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,13 +80,16 @@
 __DIR__ . '/system/ThirdParty',
 __DIR__ . '/tests/system/Config/fixtures',
 __DIR__ . '/tests/system/Filters/fixtures',
 __DIR__ . '/tests/_support',
 __DIR__ . '/tests/_support/Commands/Foobar.php',
 __DIR__ . '/tests/_support/View',

 JsonThrowOnErrorRector::class,
 YieldDataProviderRector::class,

 RemoveUnusedPrivateMethodRector::class => [
 // private method called via getPrivateMethodInvoker
 __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
 __DIR__ . '/tests/_support/Test/TestForReflectionHelper.php',
 ],

 RemoveUnusedConstructorParamRector::class => [
Expand Down

7 changes: 5 additions & 2 deletions
tests/_support/Config/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

6 changes: 2 additions & 4 deletions
tests/_support/Config/Registrar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

20 changes: 10 additions & 10 deletions
tests/_support/Database/Migrations/20160428212500_Create_test_tables.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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],
Expand All@@ -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([
Expand Down

8 changes: 4 additions & 4 deletions
tests/_support/Database/Seeds/CITestSeeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
 ],
 ],
Expand DownExpand Up@@ -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);
 }
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/Cast/CastBinaryUUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/UUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/Customfilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/RedirectFilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

4 changes: 3 additions & 1 deletion
tests/_support/Log/Handlers/TestHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

4 changes: 3 additions & 1 deletion
..._support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

4 changes: 3 additions & 1 deletion
...pport/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/_support/Models/EntityModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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';
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Models/UUIDPkeyModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Models/UserObjModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
namespace Tests\Support\Models;

use CodeIgniter\Model;
use Tests\Support\Entity\User;

class UserObjModel extends Model
{
Expand All@@ -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';
}

2 changes: 2 additions & 0 deletions
tests/_support/Models/UserTimestampModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

4 changes: 1 addition & 3 deletions
tests/_support/Publishers/TestPublisher.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

16 changes: 8 additions & 8 deletions
tests/_support/Services/Translation/TranslationNested/TranslationFour.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

30 changes: 15 additions & 15 deletions
tests/_support/Services/Translation/TranslationOne.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

28 changes: 14 additions & 14 deletions
tests/_support/Services/Translation/TranslationThree.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

31 changes: 14 additions & 17 deletions
tests/_support/Services/Translation/TranslationTwo.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(' ')
 }
}

2 changes: 2 additions & 0 deletions
tests/_support/Test/TestForReflectionHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test: refactor files in tests/_support/ by rector#8307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 3 commits into

from

Dec 8, 2023
 Merged


test: refactor files in tests/_support/ by rector
#8307
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8ff0cc0

test: add `declare(strict_types=1)`


kenjis Dec 7, 2023
8ff48df

test: refactor by rector


kenjis Dec 8, 2023
797c5d6

chore: apply rector to files in tests/_support/


kenjis Dec 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,13 +80,16 @@
 __DIR__ . '/system/ThirdParty',
 __DIR__ . '/tests/system/Config/fixtures',
 __DIR__ . '/tests/system/Filters/fixtures',
 __DIR__ . '/tests/_support',
 __DIR__ . '/tests/_support/Commands/Foobar.php',
 __DIR__ . '/tests/_support/View',

 JsonThrowOnErrorRector::class,
 YieldDataProviderRector::class,

 RemoveUnusedPrivateMethodRector::class => [
 // private method called via getPrivateMethodInvoker
 __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
 __DIR__ . '/tests/_support/Test/TestForReflectionHelper.php',
 ],

 RemoveUnusedConstructorParamRector::class => [
Expand Down

7 changes: 5 additions & 2 deletions
tests/_support/Config/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

6 changes: 2 additions & 4 deletions
tests/_support/Config/Registrar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

20 changes: 10 additions & 10 deletions
tests/_support/Database/Migrations/20160428212500_Create_test_tables.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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],
Expand All@@ -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([
Expand Down

8 changes: 4 additions & 4 deletions
tests/_support/Database/Seeds/CITestSeeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
 ],
 ],
Expand DownExpand Up@@ -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);
 }
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/Cast/CastBinaryUUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/UUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/Customfilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/RedirectFilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

4 changes: 3 additions & 1 deletion
tests/_support/Log/Handlers/TestHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

4 changes: 3 additions & 1 deletion
..._support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

4 changes: 3 additions & 1 deletion
...pport/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/_support/Models/EntityModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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';
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Models/UUIDPkeyModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Models/UserObjModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
namespace Tests\Support\Models;

use CodeIgniter\Model;
use Tests\Support\Entity\User;

class UserObjModel extends Model
{
Expand All@@ -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';
}

2 changes: 2 additions & 0 deletions
tests/_support/Models/UserTimestampModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

4 changes: 1 addition & 3 deletions
tests/_support/Publishers/TestPublisher.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

16 changes: 8 additions & 8 deletions
tests/_support/Services/Translation/TranslationNested/TranslationFour.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

30 changes: 15 additions & 15 deletions
tests/_support/Services/Translation/TranslationOne.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

28 changes: 14 additions & 14 deletions
tests/_support/Services/Translation/TranslationThree.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

31 changes: 14 additions & 17 deletions
tests/_support/Services/Translation/TranslationTwo.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(' ')
 }
}

2 changes: 2 additions & 0 deletions
tests/_support/Test/TestForReflectionHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
test: refactor files in tests/_support/ by rector#8307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 3 commits into

from

Dec 8, 2023
 Merged


test: refactor files in tests/_support/ by rector
#8307
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8ff0cc0

test: add `declare(strict_types=1)`


kenjis Dec 7, 2023
8ff48df

test: refactor by rector


kenjis Dec 8, 2023
797c5d6

chore: apply rector to files in tests/_support/


kenjis Dec 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,13 +80,16 @@
 __DIR__ . '/system/ThirdParty',
 __DIR__ . '/tests/system/Config/fixtures',
 __DIR__ . '/tests/system/Filters/fixtures',
 __DIR__ . '/tests/_support',
 __DIR__ . '/tests/_support/Commands/Foobar.php',
 __DIR__ . '/tests/_support/View',

 JsonThrowOnErrorRector::class,
 YieldDataProviderRector::class,

 RemoveUnusedPrivateMethodRector::class => [
 // private method called via getPrivateMethodInvoker
 __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
 __DIR__ . '/tests/_support/Test/TestForReflectionHelper.php',
 ],

 RemoveUnusedConstructorParamRector::class => [
Expand Down

7 changes: 5 additions & 2 deletions
tests/_support/Config/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

6 changes: 2 additions & 4 deletions
tests/_support/Config/Registrar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down

20 changes: 10 additions & 10 deletions
tests/_support/Database/Migrations/20160428212500_Create_test_tables.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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],
Expand All@@ -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([
Expand Down

8 changes: 4 additions & 4 deletions
tests/_support/Database/Seeds/CITestSeeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
 ],
 ],
Expand DownExpand Up@@ -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);
 }
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/Cast/CastBinaryUUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Entity/UUID.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/Customfilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Filters/RedirectFilter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 {
Expand Down

4 changes: 3 additions & 1 deletion
tests/_support/Log/Handlers/TestHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

4 changes: 3 additions & 1 deletion
..._support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

4 changes: 3 additions & 1 deletion
...pport/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/_support/Models/EntityModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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';
Expand Down

2 changes: 2 additions & 0 deletions
tests/_support/Models/UUIDPkeyModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

3 changes: 2 additions & 1 deletion
tests/_support/Models/UserObjModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
namespace Tests\Support\Models;

use CodeIgniter\Model;
use Tests\Support\Entity\User;

class UserObjModel extends Model
{
Expand All@@ -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';
}

2 changes: 2 additions & 0 deletions
tests/_support/Models/UserTimestampModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down

4 changes: 1 addition & 3 deletions
tests/_support/Publishers/TestPublisher.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down

16 changes: 8 additions & 8 deletions
tests/_support/Services/Translation/TranslationNested/TranslationFour.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

30 changes: 15 additions & 15 deletions
tests/_support/Services/Translation/TranslationOne.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

28 changes: 14 additions & 14 deletions
tests/_support/Services/Translation/TranslationThree.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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');
 }
}

31 changes: 14 additions & 17 deletions
tests/_support/Services/Translation/TranslationTwo.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(' ')
 }
}

2 changes: 2 additions & 0 deletions
tests/_support/Test/TestForReflectionHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
 * This file is part of CodeIgniter 4 framework.
 *
Expand Down
Loading