Skip to content

Commit 092c8f3

Browse files
samsonasiksamsonasik
authored
chore: bump Rector to 2.7.0 and clean up duplicated registered rules (#10603)
* Bump Rector to 2.7.0 and clean up duplicated registered rules * re-run rector * flip whole block test assert
1 parent 9d671be commit 092c8f3

8 files changed

Lines changed: 27 additions & 35 deletions

File tree

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"phpunit/phpcov": "^9.0.2 || ^10.0",
3030
"phpunit/phpunit": "^10.5.16 || ^11.2",
3131
"predis/predis": "^3.0",
32-
"rector/rector": "2.6.7",
32+
"rector/rector": "2.7.0",
3333
"shipmonk/phpstan-baseline-per-identifier": "^2.0"
3434
},
3535
"replace": {

‎rector.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Rector\CodeQuality\Rector\BooleanNot\NegatedAndsToPositiveOrsRector;
1616
use Rector\CodeQuality\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector;
1717
use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector;
18-
use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
1918
use Rector\CodeQuality\Rector\Isset_\IssetOnPropertyObjectToPropertyExistsRector;
2019
use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
2120
use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
@@ -174,7 +173,6 @@
174173
->withRules([
175174
DeclareStrictTypesRector::class,
176175
UnderscoreToCamelCaseVariableNameRector::class,
177-
SimplifyUselessVariableRector::class,
178176
PassStrictParameterToFunctionParameterRector::class,
179177
RemoveErrorSuppressInTryCatchStmtsRector::class,
180178
FuncGetArgsToVariadicParamRector::class,

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -544,10 +544,10 @@ public function testForeignKey(): void
544544
}
545545

546546
$this->assertSame($foreignKeyData[$foreignKeyName]->constraint_name, $foreignKeyName);
547-
$this->assertSame($foreignKeyData[$foreignKeyName]->column_name, ['users_id']);
548-
$this->assertSame($foreignKeyData[$foreignKeyName]->foreign_column_name, ['id']);
549-
$this->assertSame($foreignKeyData[$foreignKeyName]->table_name, $this->db->DBPrefix . $tableName);
550-
$this->assertSame($foreignKeyData[$foreignKeyName]->foreign_table_name, $this->db->DBPrefix . 'forge_test_users');
547+
$this->assertSame(['users_id'], $foreignKeyData[$foreignKeyName]->column_name);
548+
$this->assertSame(['id'], $foreignKeyData[$foreignKeyName]->foreign_column_name);
549+
$this->assertSame($this->db->DBPrefix . $tableName, $foreignKeyData[$foreignKeyName]->table_name);
550+
$this->assertSame($this->db->DBPrefix . 'forge_test_users', $foreignKeyData[$foreignKeyName]->foreign_table_name);
551551

552552
$this->forge->dropTable($tableName, true);
553553
$this->forge->dropTable('forge_test_users', true);
@@ -1170,63 +1170,63 @@ public function testCompositeKey(): void
11701170

11711171
if ($this->db->DBDriver === 'MySQLi') {
11721172
$this->assertSame('PRIMARY', $keys['PRIMARY']->name);
1173-
$this->assertSame($keys['PRIMARY']->fields, ['id']);
1173+
$this->assertSame(['id'], $keys['PRIMARY']->fields);
11741174
$this->assertSame('PRIMARY', $keys['PRIMARY']->type);
11751175

11761176
$this->assertSame('code_company', $keys['code_company']->name);
1177-
$this->assertSame($keys['code_company']->fields, ['code', 'company']);
1177+
$this->assertSame(['code', 'company'], $keys['code_company']->fields);
11781178
$this->assertSame('INDEX', $keys['code_company']->type);
11791179

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

11881188
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
1189-
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1189+
$this->assertSame(['code', 'company'], $keys['db_forge_test_1_code_company']->fields);
11901190
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
11911191

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

12001200
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
1201-
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1201+
$this->assertSame(['code', 'company'], $keys['db_forge_test_1_code_company']->fields);
12021202
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
12031203

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

12121212
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
1213-
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1213+
$this->assertSame(['code', 'company'], $keys['db_forge_test_1_code_company']->fields);
12141214
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
12151215

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

12241224
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
1225-
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1225+
$this->assertSame(['code', 'company'], $keys['db_forge_test_1_code_company']->fields);
12261226
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
12271227

12281228
$this->assertSame('db_forge_test_1_code_active', $keys['db_forge_test_1_code_active']->name);
1229-
$this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
1229+
$this->assertSame(['code', 'active'], $keys['db_forge_test_1_code_active']->fields);
12301230
$this->assertSame('UNIQUE', $keys['db_forge_test_1_code_active']->type);
12311231
}
12321232

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,6 @@ public function testCallStoredProcedureForCursor(): void
102102
oci_execute($result);
103103
$row = oci_fetch_array($result, OCI_ASSOC + OCI_RETURN_NULLS);
104104

105-
$this->assertSame($row, ['ONE' => '1']);
105+
$this->assertSame(['ONE' => '1'], $row);
106106
}
107107
}

‎tests/system/HTTP/CLIRequestTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ public function testGetCookie(): void
566566
{
567567
$this->assertNull($this->request->getCookie('TESTY'));
568568

569-
$this->assertSame($this->request->getCookie(), []);
569+
$this->assertSame([], $this->request->getCookie());
570570
}
571571

572572
public function testIs(): void

‎tests/system/Router/RouteCollectionTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@ static function (): void {},
13501350

13511351
$options = $routes->getRoutesOptions('administrator');
13521352

1353-
$this->assertSame($options, ['as' => 'admin', 'foo' => 'baz']);
1353+
$this->assertSame(['as' => 'admin', 'foo' => 'baz'], $options);
13541354
}
13551355

13561356
/**
@@ -1459,15 +1459,15 @@ static function (): void {},
14591459

14601460
$options = $routes->getRoutesOptions('administrator');
14611461

1462-
$this->assertSame($options, ['as' => 'admin1', 'foo' => 'baz1', 'bar' => 'baz']);
1462+
$this->assertSame(['as' => 'admin1', 'foo' => 'baz1', 'bar' => 'baz'], $options);
14631463

14641464
$options = $routes->setHTTPVerb(Method::POST)->getRoutesOptions('administrator');
14651465

1466-
$this->assertSame($options, ['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz']);
1466+
$this->assertSame(['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz'], $options);
14671467

14681468
$options = $routes->setHTTPVerb(Method::GET)->getRoutesOptions('administrator', Method::POST);
14691469

1470-
$this->assertSame($options, ['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz']);
1470+
$this->assertSame(['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz'], $options);
14711471
}
14721472

14731473
public function testRouteGroupWithFilterSimple(): void

‎tests/system/Router/RouterTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ public function testMatchedRouteOptions(): void
550550

551551
$router->handle('foo');
552552

553-
$this->assertSame($router->getMatchedRouteOptions(), ['as' => 'login', 'foo' => 'baz']);
553+
$this->assertSame(['as' => 'login', 'foo' => 'baz'], $router->getMatchedRouteOptions());
554554
}
555555

556556
public function testRouteWorksWithFilters(): void

‎tests/system/View/ParserFilterTest.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,6 @@ public function testHighlightCode(): void
181181
$parser->setData($data);
182182

183183
$template = '{ value1|highlight_code }';
184-
$expected = <<<'EOF'
185-
<code><span style="color: #000000">
186-
<span style="color: #0000BB">Sincerely&nbsp;</span>
187-
</span>
188-
</code>
189-
EOF;
190184

191185
// PHP 8.3 changes the output.
192186
if (PHP_VERSION_ID >= 80300) {

0 commit comments

Comments
 (0)