Skip to content

Commit cb39027

Browse files
committed
refactor: enable RemoveNullArgOnNullDefaultParamRector with skip on Model and Database
1 parent 50116bb commit cb39027

File tree

10 files changed

+24
-19
lines changed

10 files changed

+24
-19
lines changed

rector.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,12 @@
185185
__DIR__ . '/tests/system/Debug/ExceptionsTest.php',
186186
],
187187

188-
RemoveNullArgOnNullDefaultParamRector::class,
188+
RemoveNullArgOnNullDefaultParamRector::class => [
189+
// skip form query usage, easier to read
190+
__DIR__ . '/system/Model.php',
191+
__DIR__ . '/tests/system/Database',
192+
__DIR__ . '/tests/system/Models',
193+
],
189194
])
190195
// auto import fully qualified class names
191196
->withImportNames(removeUnusedImports: true)

system/Debug/Toolbar/Collectors/Database.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static function collect(Query $query)
104104
static::$queries[] = [
105105
'query' => $query,
106106
'string' => $queryString,
107-
'duplicate' => in_array($queryString, array_column(static::$queries, 'string', null), true),
107+
'duplicate' => in_array($queryString, array_column(static::$queries, 'string'), true),
108108
'trace' => $backtrace,
109109
];
110110
}

system/Test/FeatureTestTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public function call(string $method, string $path, ?array $params = null)
228228
->run($routes, true);
229229

230230
// Reset directory if it has been set
231-
service('router')->setDirectory(null);
231+
service('router')->setDirectory();
232232

233233
return new TestResponse($response);
234234
}

tests/system/CommonFunctionsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ public function testIsWindowsUsingMock(): void
801801
$this->assertFalse(is_windows());
802802
$this->assertNotTrue(is_windows());
803803

804-
is_windows(null);
804+
is_windows();
805805
$this->assertSame(str_contains(php_uname(), 'Windows'), is_windows());
806806
$this->assertSame(defined('PHP_WINDOWS_VERSION_MAJOR'), is_windows());
807807
}

tests/system/Config/ServicesTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ public function testNewImage(): void
163163

164164
public function testNewNegotiatorWithNullConfig(): void
165165
{
166-
$actual = Services::negotiator(null);
166+
$actual = Services::negotiator();
167167
$this->assertInstanceOf(Negotiate::class, $actual);
168168
}
169169

170170
public function testNewClirequest(): void
171171
{
172-
$actual = Services::clirequest(null);
172+
$actual = Services::clirequest();
173173
$this->assertInstanceOf(CLIRequest::class, $actual);
174174
}
175175

@@ -201,7 +201,7 @@ public function testNewUnsharedLanguage(): void
201201

202202
public function testNewPager(): void
203203
{
204-
$actual = Services::pager(null);
204+
$actual = Services::pager();
205205
$this->assertInstanceOf(Pager::class, $actual);
206206
}
207207

@@ -225,13 +225,13 @@ public function testNewToolbar(): void
225225

226226
public function testNewUri(): void
227227
{
228-
$actual = Services::uri(null);
228+
$actual = Services::uri();
229229
$this->assertInstanceOf(URI::class, $actual);
230230
}
231231

232232
public function testNewValidation(): void
233233
{
234-
$actual = Services::validation(null);
234+
$actual = Services::validation();
235235
$this->assertInstanceOf(Validation::class, $actual);
236236
}
237237

tests/system/HTTP/HeaderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public function testHeaderAppendsValueSkippedForNull(): void
126126

127127
$header = new Header($name, $value);
128128

129-
$header->appendValue(null);
129+
$header->appendValue();
130130

131131
$this->assertSame($name, $header->getName());
132132
$this->assertSame($expected, $header->getValue());
@@ -158,7 +158,7 @@ public function testHeaderPrependsValueSkippedForNull(): void
158158

159159
$header = new Header($name, $value);
160160

161-
$header->prependValue(null);
161+
$header->prependValue();
162162

163163
$this->assertSame($name, $header->getName());
164164
$this->assertSame($expected, $header->getValue());
@@ -204,7 +204,7 @@ public function testHeaderSetValueWithNullWillMarkAsEmptyString(): void
204204
$expected = '';
205205

206206
$header = new Header($name);
207-
$header->setValue('bar')->setValue(null);
207+
$header->setValue('bar')->setValue();
208208

209209
$this->assertSame($name, $header->getName());
210210
$this->assertSame($expected, $header->getValueLine());

tests/system/HTTP/IncomingRequestTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ public function testGetVarWorksWithJsonAndGetParams(): void
491491
$_REQUEST['foo'] = 'bar';
492492
$_REQUEST['fizz'] = 'buzz';
493493

494-
$request = $this->createRequest($config, null);
494+
$request = $this->createRequest($config);
495495
$request = $request->withMethod('GET');
496496

497497
// JSON type

tests/system/Helpers/DateHelperTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testNowSpecific(): void
5454

5555
public function testTimezoneSelectDefault(): void
5656
{
57-
$timezones = DateTimeZone::listIdentifiers(DateTimeZone::ALL, null);
57+
$timezones = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
5858

5959
$expected = "<select name='timezone' class='custom-select'>\n";
6060

@@ -71,7 +71,7 @@ public function testTimezoneSelectDefault(): void
7171
public function testTimezoneSelectSpecific(): void
7272
{
7373
$spesificRegion = DateTimeZone::ASIA;
74-
$timezones = DateTimeZone::listIdentifiers($spesificRegion, null);
74+
$timezones = DateTimeZone::listIdentifiers($spesificRegion);
7575

7676
$expected = "<select name='timezone' class='custom-select'>\n";
7777

tests/system/Helpers/URLHelper/SiteUrlTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public function testBaseURLService(): void
384384
);
385385
$this->assertSame(
386386
'http://example.com/ci/v4/controller/method',
387-
base_url('controller/method', null),
387+
base_url('controller/method'),
388388
);
389389
}
390390

@@ -402,7 +402,7 @@ public function testBaseURLWithCLIRequest(): void
402402
);
403403
$this->assertSame(
404404
'http://example.com/controller/method',
405-
base_url('controller/method', null),
405+
base_url('controller/method'),
406406
);
407407
}
408408

@@ -456,7 +456,7 @@ public function testBaseURLWithAllowedHostname(): void
456456

457457
$this->assertSame(
458458
'http://www.example.jp/public/controller/method',
459-
base_url('controller/method', null),
459+
base_url('controller/method'),
460460
);
461461
}
462462
}

tests/system/Test/FabricatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function testConstructorSetsFormatters(): void
7878

7979
public function testConstructorGuessesFormatters(): void
8080
{
81-
$fabricator = new Fabricator(UserModel::class, null);
81+
$fabricator = new Fabricator(UserModel::class);
8282

8383
$this->assertSame($this->formatters, $fabricator->getFormatters());
8484
}

0 commit comments

Comments
 (0)