From b8b7635e0a2edf7641e3cca6049fbd61ec666867 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Wed, 13 Nov 2024 22:06:25 +0800 Subject: [PATCH 1/2] docs: add the type to row_array in model. --- system/BaseModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/BaseModel.php b/system/BaseModel.php index 46bab107218f..a360fe57f47f 100644 --- a/system/BaseModel.php +++ b/system/BaseModel.php @@ -46,7 +46,7 @@ * - process various callbacks * - allow intermingling calls to the db connection * - * @phpstan-type row_array array + * @phpstan-type row_array array * @phpstan-type event_data_beforeinsert array{data: row_array} * @phpstan-type event_data_afterinsert array{id: int|string, data: row_array, result: bool} * @phpstan-type event_data_beforefind array{id?: int|string, method: string, singleton: bool, limit?: int, offset?: int} From bad67e1991b94f75f560231bfda601340f85ee48 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Wed, 13 Nov 2024 22:53:30 +0800 Subject: [PATCH 2/2] fix: fix the ignore. --- phpstan-baseline.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index cacc6fbda694..0edfc14b6f47 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -15777,13 +15777,13 @@ ]; $ignoreErrors[] = [ // identifier: argument.type - 'message' => '#^Parameter \\#1 \\$row of method CodeIgniter\\\\BaseModel\\:\\:save\\(\\) expects array\\\\|object, array\\\\> given\\.$#', + 'message' => '#^Parameter \\#1 \\$row of method CodeIgniter\\\\BaseModel\\:\\:save\\(\\) expects array\\|object, array> given\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/DataConverterModelTest.php', ]; $ignoreErrors[] = [ // identifier: argument.type - 'message' => '#^Parameter \\#2 \\$row of method CodeIgniter\\\\Model\\:\\:update\\(\\) expects array\\\\|object\\|null, array\\\\> given\\.$#', + 'message' => '#^Parameter \\#2 \\$row of method CodeIgniter\\\\Model\\:\\:update\\(\\) expects array\\|object\\|null, array> given\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/DataConverterModelTest.php', ]; @@ -16185,7 +16185,7 @@ ]; $ignoreErrors[] = [ // identifier: argument.type - 'message' => '#^Parameter \\#1 \\$row of method CodeIgniter\\\\BaseModel\\:\\:save\\(\\) expects array\\\\|object, array\\\\|null given\\.$#', + 'message' => '#^Parameter \\#1 \\$row of method CodeIgniter\\\\BaseModel\\:\\:save\\(\\) expects array\\|object, array\\|null given\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ];