Skip to content

fix: [4.4] merge #7781

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 2 commits into from
Aug 6, 2023
Merged

fix: [4.4] merge #7781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7849fe
chore: update phpstan-baseline.php
kenjis Aug 4, 2023
fb1bf00
test: update coding style
kenjis Aug 4, 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
10 changes: 0 additions & 10 deletions phpstan-baseline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,6 @@
'count' => 1,
'path' => __DIR__ . '/app/Config/View.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), \'loadClass\'\\} given\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Autoloader/Autoloader.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), \'loadClassmap\'\\} given\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Autoloader/Autoloader.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:chunk\\(\\) has parameter \\$userFunc with no signature specified for Closure\\.$#',
'count' => 1,
Expand Down
2 changes: 1 addition & 1 deletion tests/system/HTTP/SiteURITest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function provideConstructor(): iterable
return array_merge($this->provideSetPath(), $this->provideRelativePathWithQueryOrFragment());
}

public function provideSetPath(): iterable
public static function provideSetPath(): iterable
{
return [
'' => [
Expand Down
4 changes: 2 additions & 2 deletions tests/system/Helpers/ArrayHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ public function testArrayGroupByExcludeEmpty(array $indexes, array $data, array
$this->assertSame($expected, $actual, 'array excluding empty not the same');
}

public function provideArrayGroupByIncludeEmpty(): iterable
public static function provideArrayGroupByIncludeEmpty(): iterable
{
yield 'simple group-by test' => [
['color'],
Expand Down Expand Up @@ -930,7 +930,7 @@ public function provideArrayGroupByIncludeEmpty(): iterable
];
}

public function provideArrayGroupByExcludeEmpty(): iterable
public static function provideArrayGroupByExcludeEmpty(): iterable
{
yield 'simple group-by test' => [
['color'],
Expand Down
2 changes: 1 addition & 1 deletion tests/system/View/TableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ public function testGenerateOrderedColumns(array $heading, array $row, string $e
$this->assertStringContainsString($expectContainsString, $generated);
}

public function orderedColumnUsecases(): iterable
public static function orderedColumnUsecases(): iterable
{
yield from [
'reorder example #1' => [
Expand Down