Skip to content

Commit caf4d53

Browse files
samsonasiksamsonasik
authored
Merge pull request #9244 from samsonasik/refactor-enable-simplify-bool-identical-true
refactor: enable SimplifyBoolIdenticalTrueRector
2 parents 8522a37 + 3f8feaa commit caf4d53

31 files changed

+69
-72
lines changed

‎phpstan-baseline.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7849,12 +7849,6 @@
78497849
'count' => 1,
78507850
'path' => __DIR__ . '/system/Log/Handlers/FileHandler.php',
78517851
];
7852-
$ignoreErrors[] = [
7853-
// identifier: identical.alwaysTrue
7854-
'message' => '#^Strict comparison using \\=\\=\\= between true and true will always evaluate to true\\.$#',
7855-
'count' => 1,
7856-
'path' => __DIR__ . '/system/Log/Handlers/FileHandler.php',
7857-
];
78587852
$ignoreErrors[] = [
78597853
// identifier: missingType.iterableValue
78607854
'message' => '#^Method CodeIgniter\\\\Log\\\\Logger\\:\\:determineFile\\(\\) return type has no value type specified in iterable type array\\.$#',

‎rector.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
2020
use Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector;
2121
use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
22+
use Rector\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector;
2223
use Rector\CodeQuality\Rector\If_\CombineIfRector;
2324
use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
2425
use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
@@ -211,6 +212,7 @@
211212
AddMethodCallBasedStrictParamTypeRector::class,
212213
TypedPropertyFromAssignsRector::class,
213214
ClosureReturnTypeRector::class,
215+
SimplifyBoolIdenticalTrueRector::class,
214216
])
215217
->withConfiguredRule(StringClassNameToClassConstantRector::class, [
216218
// keep '\\' prefix string on string '\Foo\Bar'

‎system/CLI/CLI.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ public static function beep(int $num = 1)
514514
*/
515515
public static function wait(int $seconds, bool $countdown = false)
516516
{
517-
if ($countdown === true) {
517+
if ($countdown) {
518518
$time = $seconds;
519519

520520
while ($time > 0) {

‎system/Cache/Handlers/FileHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,15 +308,15 @@ protected function deleteFiles(string $path, bool $delDir = false, bool $htdocs
308308
if ($filename !== '.' && $filename !== '..') {
309309
if (is_dir($path . DIRECTORY_SEPARATOR . $filename) && $filename[0] !== '.') {
310310
$this->deleteFiles($path . DIRECTORY_SEPARATOR . $filename, $delDir, $htdocs, $_level + 1);
311-
} elseif ($htdocs !== true || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) {
311+
} elseif (! $htdocs || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) {
312312
@unlink($path . DIRECTORY_SEPARATOR . $filename);
313313
}
314314
}
315315
}
316316

317317
closedir($currentDir);
318318

319-
return ($delDir === true && $_level > 0) ? @rmdir($path) : true;
319+
return ($delDir && $_level > 0) ? @rmdir($path) : true;
320320
}
321321

322322
/**

‎system/Config/Services.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public static function csp(?CSPConfig $config = null, bool $getShared = true)
202202
*/
203203
public static function curlrequest(array $options = [], ?ResponseInterface $response = null, ?App $config = null, bool $getShared = true)
204204
{
205-
if ($getShared === true) {
205+
if ($getShared) {
206206
return static::getSharedInstance('curlrequest', $options, $response, $config);
207207
}
208208

‎system/Database/BaseBuilder.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ public function distinct(bool $val = true)
579579
*/
580580
public function from($from, bool $overwrite = false): self
581581
{
582-
if ($overwrite === true) {
582+
if ($overwrite) {
583583
$this->QBFrom = [];
584584
$this->db->setAliasedTables([]);
585585
}
@@ -769,7 +769,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
769769
foreach ($keyValue as $k => $v) {
770770
$prefix = empty($this->{$qbKey}) ? $this->groupGetType('') : $this->groupGetType($type);
771771

772-
if ($rawSqlOnly === true) {
772+
if ($rawSqlOnly) {
773773
$k = '';
774774
$op = '';
775775
} elseif ($v !== null) {
@@ -1150,7 +1150,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
11501150
$keyValue = ! is_array($field) ? [$field => $match] : $field;
11511151

11521152
foreach ($keyValue as $k => $v) {
1153-
if ($insensitiveSearch === true) {
1153+
if ($insensitiveSearch) {
11541154
$v = strtolower($v);
11551155
}
11561156

@@ -1187,7 +1187,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
11871187
*/
11881188
protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
11891189
{
1190-
if ($insensitiveSearch === true) {
1190+
if ($insensitiveSearch) {
11911191
return "{$prefix} LOWER(" . $this->db->escapeIdentifiers($column) . ") {$not} LIKE :{$bind}:";
11921192
}
11931193

@@ -1599,7 +1599,7 @@ public function getCompiledSelect(bool $reset = true): string
15991599
{
16001600
$select = $this->compileSelect();
16011601

1602-
if ($reset === true) {
1602+
if ($reset) {
16031603
$this->resetSelect();
16041604
}
16051605

@@ -1643,7 +1643,7 @@ public function get(?int $limit = null, int $offset = 0, bool $reset = true)
16431643
? $this->getCompiledSelect($reset)
16441644
: $this->db->query($this->compileSelect(), $this->binds, false);
16451645

1646-
if ($reset === true) {
1646+
if ($reset) {
16471647
$this->resetSelect();
16481648

16491649
// Clear our binds so we don't eat up memory
@@ -1678,7 +1678,7 @@ public function countAll(bool $reset = true)
16781678

16791679
$query = $query->getRow();
16801680

1681-
if ($reset === true) {
1681+
if ($reset) {
16821682
$this->resetSelect();
16831683
}
16841684

@@ -1727,7 +1727,7 @@ public function countAllResults(bool $reset = true)
17271727

17281728
$result = $this->db->query($sql, $this->binds, false);
17291729

1730-
if ($reset === true) {
1730+
if ($reset) {
17311731
$this->resetSelect();
17321732
} elseif (! isset($this->QBOrderBy)) {
17331733
$this->QBOrderBy = $orderBy;
@@ -1781,7 +1781,7 @@ public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bo
17811781
? $this->getCompiledSelect($reset)
17821782
: $this->db->query($this->compileSelect(), $this->binds, false);
17831783

1784-
if ($reset === true) {
1784+
if ($reset) {
17851785
$this->resetSelect();
17861786

17871787
// Clear our binds so we don't eat up memory
@@ -2297,7 +2297,7 @@ public function getCompiledInsert(bool $reset = true)
22972297
array_values($this->QBSet)
22982298
);
22992299

2300-
if ($reset === true) {
2300+
if ($reset) {
23012301
$this->resetWrite();
23022302
}
23032303

@@ -2466,7 +2466,7 @@ public function getCompiledUpdate(bool $reset = true)
24662466

24672467
$sql = $this->_update($this->QBFrom[0], $this->QBSet);
24682468

2469-
if ($reset === true) {
2469+
if ($reset) {
24702470
$this->resetWrite();
24712471
}
24722472

‎system/Database/BaseConnection.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ public function transBegin(bool $testMode = false): bool
848848
// Reset the transaction failure flag.
849849
// If the $test_mode flag is set to TRUE transactions will be rolled back
850850
// even if the queries produce a successful result.
851-
$this->transFailure = ($testMode === true);
851+
$this->transFailure = $testMode;
852852

853853
if ($this->_transBegin()) {
854854
$this->transDepth++;
@@ -1124,7 +1124,7 @@ public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $pro
11241124
$item = preg_replace('/^' . $this->swapPre . '(\S+?)/', $this->DBPrefix . '\\1', $item);
11251125
}
11261126
// Do we prefix an item with no segments?
1127-
elseif ($prefixSingle === true && ! str_starts_with($item, $this->DBPrefix)) {
1127+
elseif ($prefixSingle && ! str_starts_with($item, $this->DBPrefix)) {
11281128
$item = $this->DBPrefix . $item;
11291129
}
11301130
}
@@ -1147,7 +1147,7 @@ private function protectDotItem(string $item, string $alias, bool $protectIdenti
11471147
// NOTE: The ! empty() condition prevents this method
11481148
// from breaking when QB isn't enabled.
11491149
if (! empty($this->aliasedTables) && in_array($parts[0], $this->aliasedTables, true)) {
1150-
if ($protectIdentifiers === true) {
1150+
if ($protectIdentifiers) {
11511151
foreach ($parts as $key => $val) {
11521152
if (! in_array($val, $this->reservedIdentifiers, true)) {
11531153
$parts[$key] = $this->escapeIdentifiers($val);
@@ -1198,7 +1198,7 @@ private function protectDotItem(string $item, string $alias, bool $protectIdenti
11981198
$item = implode('.', $parts);
11991199
}
12001200

1201-
if ($protectIdentifiers === true) {
1201+
if ($protectIdentifiers) {
12021202
$item = $this->escapeIdentifiers($item);
12031203
}
12041204

@@ -1372,7 +1372,7 @@ public function escapeString($str, bool $like = false)
13721372
$str = $this->_escapeString($str);
13731373

13741374
// escape LIKE condition wildcards
1375-
if ($like === true) {
1375+
if ($like) {
13761376
return str_replace(
13771377
[
13781378
$this->likeEscapeChar,
@@ -1501,7 +1501,7 @@ public function listTables(bool $constrainByPrefix = false)
15011501
*/
15021502
public function tableExists(string $tableName, bool $cached = true): bool
15031503
{
1504-
if ($cached === true) {
1504+
if ($cached) {
15051505
return in_array($this->protectIdentifiers($tableName, true, false, false), $this->listTables(), true);
15061506
}
15071507

‎system/Database/Forge.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,12 @@ public function addForeignKey(
449449
*/
450450
public function dropKey(string $table, string $keyName, bool $prefixKeyName = true): bool
451451
{
452-
$keyName = $this->db->escapeIdentifiers(($prefixKeyName === true ? $this->db->DBPrefix : '') . $keyName);
452+
$keyName = $this->db->escapeIdentifiers(($prefixKeyName ? $this->db->DBPrefix : '') . $keyName);
453453
$table = $this->db->escapeIdentifiers($this->db->DBPrefix . $table);
454454

455455
$dropKeyAsConstraint = $this->dropKeyAsConstraint($table, $keyName);
456456

457-
if ($dropKeyAsConstraint === true) {
457+
if ($dropKeyAsConstraint) {
458458
$sql = sprintf(
459459
$this->dropConstraintStr,
460460
$table,
@@ -559,7 +559,7 @@ public function createTable(string $table, bool $ifNotExists = false, array $att
559559
}
560560

561561
// If table exists lets stop here
562-
if ($ifNotExists === true && $this->db->tableExists($table, false)) {
562+
if ($ifNotExists && $this->db->tableExists($table, false)) {
563563
$this->reset();
564564

565565
return true;
@@ -895,7 +895,7 @@ protected function _processFields(bool $createTable = false): array
895895

896896
$attributes = array_change_key_case($attributes, CASE_UPPER);
897897

898-
if ($createTable === true && empty($attributes['TYPE'])) {
898+
if ($createTable && empty($attributes['TYPE'])) {
899899
continue;
900900
}
901901

@@ -942,7 +942,7 @@ protected function _processFields(bool $createTable = false): array
942942
} else {
943943
$field['null'] = ' NOT ' . $this->null;
944944
}
945-
} elseif ($createTable === true) {
945+
} elseif ($createTable) {
946946
$field['null'] = ' NOT ' . $this->null;
947947
}
948948

@@ -1085,7 +1085,7 @@ protected function _processPrimaryKeys(string $table, bool $asQuery = false): st
10851085
}
10861086

10871087
if (isset($this->primaryKeys['fields']) && $this->primaryKeys['fields'] !== []) {
1088-
if ($asQuery === true) {
1088+
if ($asQuery) {
10891089
$sql .= 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $table) . ' ADD ';
10901090
} else {
10911091
$sql .= ",\n\t";
@@ -1229,7 +1229,7 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar
12291229
$referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
12301230
$referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
12311231

1232-
if ($asQuery === true) {
1232+
if ($asQuery) {
12331233
$sqls[$index] .= 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $table) . ' ADD ';
12341234
} else {
12351235
$sqls[$index] .= ",\n\t";

‎system/Database/MySQLi/Connection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function connect(bool $persistent = false)
9696
$port = null;
9797
$socket = $this->hostname;
9898
} else {
99-
$hostname = ($persistent === true) ? 'p:' . $this->hostname : $this->hostname;
99+
$hostname = $persistent ? 'p:' . $this->hostname : $this->hostname;
100100
$port = empty($this->port) ? null : $this->port;
101101
$socket = '';
102102
}
@@ -399,7 +399,7 @@ protected function _listTables(bool $prefixLimit = false, ?string $tableName = n
399399
return $sql . ' LIKE ' . $this->escape($tableName);
400400
}
401401

402-
if ($prefixLimit !== false && $this->DBPrefix !== '') {
402+
if ($prefixLimit && $this->DBPrefix !== '') {
403403
return $sql . " LIKE '" . $this->escapeLikeStringDirect($this->DBPrefix) . "%'";
404404
}
405405

‎system/Database/MySQLi/Forge.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ protected function _processIndexes(string $table, bool $asQuery = false): array
222222
implode('_', $this->keys[$i]['fields']) :
223223
$this->keys[$i]['keyName']);
224224

225-
if ($asQuery === true) {
225+
if ($asQuery) {
226226
$sqls[$index] = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table) . " ADD {$unique}KEY "
227227
. $keyName
228228
. ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i]['fields'])) . ')';

‎system/Database/OCI8/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ protected function _listTables(bool $prefixLimit = false, ?string $tableName = n
274274
return $sql . ' WHERE "TABLE_NAME" LIKE ' . $this->escape($tableName);
275275
}
276276

277-
if ($prefixLimit !== false && $this->DBPrefix !== '') {
277+
if ($prefixLimit && $this->DBPrefix !== '') {
278278
return $sql . ' WHERE "TABLE_NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . "%' "
279279
. sprintf($this->likeEscapeStr, $this->likeEscapeChar);
280280
}

‎system/Database/OCI8/Forge.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
135135
$wantToAddNull = ! str_contains($processedFields[$i]['null'], ' NOT');
136136
$currentNullable = $nullableMap[$processedFields[$i]['name']];
137137

138-
if ($wantToAddNull === true && $currentNullable === true) {
138+
if ($wantToAddNull && $currentNullable === true) {
139139
$processedFields[$i]['null'] = '';
140140
} elseif ($processedFields[$i]['null'] === '' && $currentNullable === false) {
141141
// Nullable by default
@@ -293,7 +293,7 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade)
293293
{
294294
$sql = parent::_dropTable($table, $ifExists, $cascade);
295295

296-
if ($sql !== true && $cascade === true) {
296+
if ($sql !== true && $cascade) {
297297
$sql .= ' CASCADE CONSTRAINTS PURGE';
298298
} elseif ($sql !== true) {
299299
$sql .= ' PURGE';

‎system/Database/Postgre/Builder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ protected function _truncate(string $table): string
293293
*/
294294
protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
295295
{
296-
$op = $insensitiveSearch === true ? 'ILIKE' : 'LIKE';
296+
$op = $insensitiveSearch ? 'ILIKE' : 'LIKE';
297297

298298
return "{$prefix} {$column} {$not} {$op} :{$bind}:";
299299
}

‎system/Database/Postgre/Connection.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ public function connect(bool $persistent = false)
7474
$this->convertDSN();
7575
}
7676

77-
$this->connID = $persistent === true ? pg_pconnect($this->DSN) : pg_connect($this->DSN);
77+
$this->connID = $persistent ? pg_pconnect($this->DSN) : pg_connect($this->DSN);
7878

7979
if ($this->connID !== false) {
8080
if (
81-
$persistent === true
81+
$persistent
8282
&& pg_connection_status($this->connID) === PGSQL_CONNECTION_BAD
8383
&& pg_ping($this->connID) === false
8484
) {
@@ -289,7 +289,7 @@ protected function _listTables(bool $prefixLimit = false, ?string $tableName = n
289289
return $sql . ' AND "table_name" LIKE ' . $this->escape($tableName);
290290
}
291291

292-
if ($prefixLimit !== false && $this->DBPrefix !== '') {
292+
if ($prefixLimit && $this->DBPrefix !== '') {
293293
return $sql . ' AND "table_name" LIKE \''
294294
. $this->escapeLikeString($this->DBPrefix) . "%' "
295295
. sprintf($this->likeEscapeStr, $this->likeEscapeChar);

‎system/Database/Postgre/Forge.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
118118
$nullable = false;
119119
}
120120
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
121-
. ($nullable === true ? ' DROP' : ' SET') . ' NOT NULL';
121+
. ($nullable ? ' DROP' : ' SET') . ' NOT NULL';
122122

123123
if (! empty($field['new_name'])) {
124124
$sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($field['name'])
@@ -195,7 +195,7 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade): str
195195
{
196196
$sql = parent::_dropTable($table, $ifExists, $cascade);
197197

198-
if ($cascade === true) {
198+
if ($cascade) {
199199
$sql .= ' CASCADE';
200200
}
201201

‎system/Database/SQLSRV/Builder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ public function countAll(bool $reset = true)
518518

519519
$query = $query->getRow();
520520

521-
if ($reset === true) {
521+
if ($reset) {
522522
$this->resetSelect();
523523
}
524524

‎system/Database/SQLSRV/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ protected function _listTables(bool $prefixLimit = false, ?string $tableName = n
215215
return $sql .= ' AND [TABLE_NAME] LIKE ' . $this->escape($tableName);
216216
}
217217

218-
if ($prefixLimit === true && $this->DBPrefix !== '') {
218+
if ($prefixLimit && $this->DBPrefix !== '') {
219219
$sql .= " AND [TABLE_NAME] LIKE '" . $this->escapeLikeString($this->DBPrefix) . "%' "
220220
. sprintf($this->likeEscapeStr, $this->likeEscapeChar);
221221
}

0 commit comments

Comments
 (0)