Skip to content

Commit fe9bcb2

Browse files
samsonasiksamsonasik
committed
refactor: Move property to local variable on usage only in setUp() method in tests
1 parent 52c74b5 commit fe9bcb2

26 files changed

+103
-125
lines changed

‎tests/system/CLI/ConsoleTest.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,12 @@ final class ConsoleTest extends CIUnitTestCase
3030
{
3131
use StreamFilterTrait;
3232

33-
private DotEnv $env;
34-
3533
protected function setUp(): void
3634
{
3735
parent::setUp();
3836

39-
$this->env = new DotEnv(ROOTPATH);
40-
$this->env->load();
37+
$env = new DotEnv(ROOTPATH);
38+
$env->load();
4139

4240
// Set environment values that would otherwise stop the framework from functioning during tests.
4341
if (! isset($_SERVER['app.baseURL'])) {

‎tests/system/Cache/Handlers/MemcachedHandlerTest.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
#[Group('CacheLive')]
2626
final class MemcachedHandlerTest extends AbstractHandlerTestCase
2727
{
28-
private Cache $config;
29-
3028
private static function getKeyArray()
3129
{
3230
return [
@@ -44,9 +42,9 @@ protected function setUp(): void
4442
$this->markTestSkipped('Memcached extension not loaded.');
4543
}
4644

47-
$this->config = new Cache();
45+
$config = new Cache();
4846

49-
$this->handler = new MemcachedHandler($this->config);
47+
$this->handler = new MemcachedHandler($config);
5048

5149
$this->handler->initialize();
5250
}

‎tests/system/CodeIgniterTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
final class CodeIgniterTest extends CIUnitTestCase
4848
{
4949
private CodeIgniter $codeigniter;
50-
protected $routes;
5150

5251
#[WithoutErrorHandler]
5352
protected function setUp(): void

‎tests/system/Config/DotEnvTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
final class DotEnvTest extends CIUnitTestCase
3333
{
3434
private ?vfsStreamDirectory $root;
35-
private string $path;
3635
private string $fixturesFolder;
3736

3837
#[WithoutErrorHandler]
@@ -42,8 +41,8 @@ protected function setUp(): void
4241

4342
$this->root = vfsStream::setup();
4443
$this->fixturesFolder = $this->root->url();
45-
$this->path = TESTPATH . 'system/Config/fixtures';
46-
vfsStream::copyFromFileSystem($this->path, $this->root);
44+
$path = TESTPATH . 'system/Config/fixtures';
45+
vfsStream::copyFromFileSystem($path, $this->root);
4746

4847
$file = 'unreadable.env';
4948
$path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;

‎tests/system/ControllerTest.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#[Group('Others')]
4141
final class ControllerTest extends CIUnitTestCase
4242
{
43-
private App $config;
4443
private ?Controller $controller = null;
4544

4645
/**
@@ -59,9 +58,9 @@ protected function setUp(): void
5958
{
6059
parent::setUp();
6160

62-
$this->config = new App();
63-
$this->request = new IncomingRequest($this->config, new SiteURI($this->config), null, new UserAgent());
64-
$this->response = new Response($this->config);
61+
$config = new App();
62+
$this->request = new IncomingRequest($config, new SiteURI($config), null, new UserAgent());
63+
$this->response = new Response($config);
6564
$this->logger = Services::logger();
6665
}
6766

‎tests/system/Database/Live/ForgeTest.php‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@ public function testCreateTableApplyBigInt(): void
278278

279279
$fieldsData = $this->db->getFieldData('forge_test_table');
280280
if ($this->db->DBDriver === 'MySQLi') {
281-
$this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
281+
$this->assertSame('bigint', strtolower($fieldsData[0]->type));
282282
} elseif ($this->db->DBDriver === 'Postgre') {
283-
$this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
283+
$this->assertSame('bigint', strtolower($fieldsData[0]->type));
284284
} elseif ($this->db->DBDriver === 'SQLite3') {
285-
$this->assertSame(strtolower($fieldsData[0]->type), 'integer');
285+
$this->assertSame('integer', strtolower($fieldsData[0]->type));
286286
} elseif ($this->db->DBDriver === 'OCI8') {
287-
$this->assertSame(strtolower($fieldsData[0]->type), 'number');
287+
$this->assertSame('number', strtolower($fieldsData[0]->type));
288288
} elseif ($this->db->DBDriver === 'SQLSRV') {
289-
$this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
289+
$this->assertSame('bigint', strtolower($fieldsData[0]->type));
290290
}
291291

292292
$this->forge->dropTable('forge_test_table', true);
@@ -1166,65 +1166,65 @@ public function testCompositeKey(): void
11661166
$keys = $this->db->getIndexData('forge_test_1');
11671167

11681168
if ($this->db->DBDriver === 'MySQLi') {
1169-
$this->assertSame($keys['PRIMARY']->name, 'PRIMARY');
1169+
$this->assertSame('PRIMARY', $keys['PRIMARY']->name);
11701170
$this->assertSame($keys['PRIMARY']->fields, ['id']);
1171-
$this->assertSame($keys['PRIMARY']->type, 'PRIMARY');
1171+
$this->assertSame('PRIMARY', $keys['PRIMARY']->type);
11721172

1173-
$this->assertSame($keys['code_company']->name, 'code_company');
1173+
$this->assertSame('code_company', $keys['code_company']->name);
11741174
$this->assertSame($keys['code_company']->fields, ['code', 'company']);
1175-
$this->assertSame($keys['code_company']->type, 'INDEX');
1175+
$this->assertSame('INDEX', $keys['code_company']->type);
11761176

1177-
$this->assertSame($keys['code_active']->name, 'code_active');
1177+
$this->assertSame('code_active', $keys['code_active']->name);
11781178
$this->assertSame($keys['code_active']->fields, ['code', 'active']);
1179-
$this->assertSame($keys['code_active']->type, 'UNIQUE');
1179+
$this->assertSame('UNIQUE', $keys['code_active']->type);
11801180
} elseif ($this->db->DBDriver === 'Postgre') {
1181-
$this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
1181+
$this->assertSame('pk_db_forge_test_1', $keys['pk_db_forge_test_1']->name);
11821182
$this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
1183-
$this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
1183+
$this->assertSame('PRIMARY', $keys['pk_db_forge_test_1']->type);
11841184

1185-
$this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
1185+
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
11861186
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1187-
$this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
1187+
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
11881188

1189-
$this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
1189+
$this->assertSame('db_forge_test_1_code_active', $keys['db_forge_test_1_code_active']->name);
11901190
$this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
1191-
$this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
1191+
$this->assertSame('UNIQUE', $keys['db_forge_test_1_code_active']->type);
11921192
} elseif ($this->db->DBDriver === 'SQLite3') {
1193-
$this->assertSame($keys['PRIMARY']->name, 'PRIMARY');
1193+
$this->assertSame('PRIMARY', $keys['PRIMARY']->name);
11941194
$this->assertSame($keys['PRIMARY']->fields, ['id']);
1195-
$this->assertSame($keys['PRIMARY']->type, 'PRIMARY');
1195+
$this->assertSame('PRIMARY', $keys['PRIMARY']->type);
11961196

1197-
$this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
1197+
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
11981198
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1199-
$this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
1199+
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
12001200

1201-
$this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
1201+
$this->assertSame('db_forge_test_1_code_active', $keys['db_forge_test_1_code_active']->name);
12021202
$this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
1203-
$this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
1203+
$this->assertSame('UNIQUE', $keys['db_forge_test_1_code_active']->type);
12041204
} elseif ($this->db->DBDriver === 'SQLSRV') {
1205-
$this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
1205+
$this->assertSame('pk_db_forge_test_1', $keys['pk_db_forge_test_1']->name);
12061206
$this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
1207-
$this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
1207+
$this->assertSame('PRIMARY', $keys['pk_db_forge_test_1']->type);
12081208

1209-
$this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
1209+
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
12101210
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1211-
$this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
1211+
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
12121212

1213-
$this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
1213+
$this->assertSame('db_forge_test_1_code_active', $keys['db_forge_test_1_code_active']->name);
12141214
$this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
1215-
$this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
1215+
$this->assertSame('UNIQUE', $keys['db_forge_test_1_code_active']->type);
12161216
} elseif ($this->db->DBDriver === 'OCI8') {
1217-
$this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
1217+
$this->assertSame('pk_db_forge_test_1', $keys['pk_db_forge_test_1']->name);
12181218
$this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
1219-
$this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
1219+
$this->assertSame('PRIMARY', $keys['pk_db_forge_test_1']->type);
12201220

1221-
$this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
1221+
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
12221222
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1223-
$this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
1223+
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
12241224

1225-
$this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
1225+
$this->assertSame('db_forge_test_1_code_active', $keys['db_forge_test_1_code_active']->name);
12261226
$this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
1227-
$this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
1227+
$this->assertSame('UNIQUE', $keys['db_forge_test_1_code_active']->type);
12281228
}
12291229

12301230
$this->forge->dropTable('forge_test_1', true);

‎tests/system/Database/Live/OCI8/CallStoredProcedureTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function testCallPackageProcedure(): void
5555
],
5656
]);
5757

58-
$this->assertSame($result, '7');
58+
$this->assertSame('7', $result);
5959
}
6060

6161
public function testCallStoredProcedure(): void
@@ -77,7 +77,7 @@ public function testCallStoredProcedure(): void
7777
],
7878
]);
7979

80-
$this->assertSame($result, '7');
80+
$this->assertSame('7', $result);
8181
}
8282

8383
public function testCallStoredProcedureForCursor(): void

‎tests/system/Database/Live/OCI8/LastInsertIDTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ public function testGetInsertIDWithInsert(): void
4949
$this->db->table('job')->insert($jobData);
5050
$actual = $this->db->insertID();
5151

52-
$this->assertSame($actual, 5);
52+
$this->assertSame(5, $actual);
5353
}
5454

5555
public function testGetInsertIDWithQuery(): void
5656
{
5757
$this->db->query('INSERT INTO "db_job" ("name", "description") VALUES (?, ?)', ['Grocery Sales', 'Discount!']);
5858
$actual = $this->db->insertID();
5959

60-
$this->assertSame($actual, 5);
60+
$this->assertSame(5, $actual);
6161
}
6262

6363
public function testGetInsertIDWithHasCommentQuery(): void
@@ -73,7 +73,7 @@ public function testGetInsertIDWithHasCommentQuery(): void
7373
$this->db->query($sql, ['Discount!']);
7474
$actual = $this->db->insertID();
7575

76-
$this->assertSame($actual, 5);
76+
$this->assertSame(5, $actual);
7777
}
7878

7979
public function testGetInsertIDWithPreparedQuery(): void
@@ -87,6 +87,6 @@ public function testGetInsertIDWithPreparedQuery(): void
8787
$query->execute('foo', 'bar');
8888
$actual = $this->db->insertID();
8989

90-
$this->assertSame($actual, 5);
90+
$this->assertSame(5, $actual);
9191
}
9292
}

‎tests/system/Files/FileCollectionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,6 @@ public function testIterable(): void
577577
$count++;
578578
}
579579

580-
$this->assertSame($count, 5);
580+
$this->assertSame(5, $count);
581581
}
582582
}

‎tests/system/Files/FileWithVfsTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ final class FileWithVfsTest extends CIUnitTestCase
2626
{
2727
// For VFS stuff
2828
private ?vfsStreamDirectory $root = null;
29-
private string $path;
3029
private string $start;
3130
private File $file;
3231

@@ -35,8 +34,8 @@ protected function setUp(): void
3534
parent::setUp();
3635

3736
$this->root = vfsStream::setup();
38-
$this->path = '_support/Files/';
39-
vfsStream::copyFromFileSystem(TESTPATH . $this->path, $this->root);
37+
$path = '_support/Files/';
38+
vfsStream::copyFromFileSystem(TESTPATH . $path, $this->root);
4039
$this->start = $this->root->url() . '/';
4140
$this->file = new File($this->start . 'able/apple.php');
4241
}

0 commit comments

Comments
 (0)