Skip to content

Commit 45b5a80

Browse files
committed
Fix PHPStan iterable type errors in BaseModel, Model, and BaseHandler; clean baseline (#8732)
1 parent df61e52 commit 45b5a80

File tree

2 files changed

+6
-26
lines changed

2 files changed

+6
-26
lines changed

system/BaseModel.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ abstract protected function doFindColumn(string $columnName);
436436
* @param int|null $limit Limit
437437
* @param int $offset Offset
438438
*
439-
* @return array
439+
* @return array<int,array<int|string,bool|float|int|object|string|null>|object>
440440
*/
441441
abstract protected function doFindAll(?int $limit = null, int $offset = 0);
442442

@@ -629,7 +629,7 @@ public function find($id = null)
629629
*
630630
* @param string $columnName Column Name
631631
*
632-
* @return array|null The resulting row of data, or null if no data found.
632+
* @return array<int,mixed>|null The resulting row of data, or null if no data found.
633633
*
634634
* @throws DataException
635635
*/
@@ -650,7 +650,7 @@ public function findColumn(string $columnName)
650650
* @param int $limit Limit
651651
* @param int $offset Offset
652652
*
653-
* @return array
653+
* @return array<mixed>
654654
*/
655655
public function findAll(?int $limit = null, int $offset = 0)
656656
{
@@ -695,7 +695,7 @@ public function findAll(?int $limit = null, int $offset = 0)
695695
/**
696696
* Returns the first row of the result set.
697697
*
698-
* @return array|object|null
698+
* @return array<string,mixed>|object|null
699699
*/
700700
public function first()
701701
{

utils/phpstan-baseline/missingType.iterableValue.neon

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# total 1215 errors
1+
# total 1209 errors
22

33
parameters:
44
ignoreErrors:
55
-
66
message: '#^Method CodeIgniter\\BaseModel\:\:__call\(\) has parameter \$params with no value type specified in iterable type array\.$#'
77
count: 1
88
path: ../../system/BaseModel.php
9-
9+
1010
-
1111
message: '#^Method CodeIgniter\\BaseModel\:\:convertToReturnType\(\) return type has no value type specified in iterable type array\.$#'
1212
count: 1
@@ -27,11 +27,6 @@ parameters:
2727
count: 1
2828
path: ../../system/BaseModel.php
2929

30-
-
31-
message: '#^Method CodeIgniter\\BaseModel\:\:doFindAll\(\) return type has no value type specified in iterable type array\.$#'
32-
count: 1
33-
path: ../../system/BaseModel.php
34-
3530
-
3631
message: '#^Method CodeIgniter\\BaseModel\:\:doFindColumn\(\) return type has no value type specified in iterable type array\.$#'
3732
count: 1
@@ -72,21 +67,6 @@ parameters:
7267
count: 1
7368
path: ../../system/BaseModel.php
7469

75-
-
76-
message: '#^Method CodeIgniter\\BaseModel\:\:findAll\(\) return type has no value type specified in iterable type array\.$#'
77-
count: 1
78-
path: ../../system/BaseModel.php
79-
80-
-
81-
message: '#^Method CodeIgniter\\BaseModel\:\:findColumn\(\) return type has no value type specified in iterable type array\.$#'
82-
count: 1
83-
path: ../../system/BaseModel.php
84-
85-
-
86-
message: '#^Method CodeIgniter\\BaseModel\:\:first\(\) return type has no value type specified in iterable type array\.$#'
87-
count: 1
88-
path: ../../system/BaseModel.php
89-
9070
-
9171
message: '#^Method CodeIgniter\\BaseModel\:\:getIdValue\(\) return type has no value type specified in iterable type array\.$#'
9272
count: 1

0 commit comments

Comments
 (0)