Skip to content

Commit 1f6baa0

Browse files
kenjiskenjis
authored
Merge pull request #8708 from kenjis/fix-var-in-BaseModel
docs: update `@var` types in BaseModel
2 parents 07e3999 + e2ac94a commit 1f6baa0

File tree

2 files changed

+12
-132
lines changed

2 files changed

+12
-132
lines changed

‎phpstan-baseline.php‎

Lines changed: 0 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -261,66 +261,6 @@
261261
'count' => 1,
262262
'path' => __DIR__ . '/system/BaseModel.php',
263263
];
264-
$ignoreErrors[] = [
265-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterDelete type has no value type specified in iterable type array\\.$#',
266-
'count' => 1,
267-
'path' => __DIR__ . '/system/BaseModel.php',
268-
];
269-
$ignoreErrors[] = [
270-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterFind type has no value type specified in iterable type array\\.$#',
271-
'count' => 1,
272-
'path' => __DIR__ . '/system/BaseModel.php',
273-
];
274-
$ignoreErrors[] = [
275-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterInsert type has no value type specified in iterable type array\\.$#',
276-
'count' => 1,
277-
'path' => __DIR__ . '/system/BaseModel.php',
278-
];
279-
$ignoreErrors[] = [
280-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterInsertBatch type has no value type specified in iterable type array\\.$#',
281-
'count' => 1,
282-
'path' => __DIR__ . '/system/BaseModel.php',
283-
];
284-
$ignoreErrors[] = [
285-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterUpdate type has no value type specified in iterable type array\\.$#',
286-
'count' => 1,
287-
'path' => __DIR__ . '/system/BaseModel.php',
288-
];
289-
$ignoreErrors[] = [
290-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterUpdateBatch type has no value type specified in iterable type array\\.$#',
291-
'count' => 1,
292-
'path' => __DIR__ . '/system/BaseModel.php',
293-
];
294-
$ignoreErrors[] = [
295-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeDelete type has no value type specified in iterable type array\\.$#',
296-
'count' => 1,
297-
'path' => __DIR__ . '/system/BaseModel.php',
298-
];
299-
$ignoreErrors[] = [
300-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeFind type has no value type specified in iterable type array\\.$#',
301-
'count' => 1,
302-
'path' => __DIR__ . '/system/BaseModel.php',
303-
];
304-
$ignoreErrors[] = [
305-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeInsert type has no value type specified in iterable type array\\.$#',
306-
'count' => 1,
307-
'path' => __DIR__ . '/system/BaseModel.php',
308-
];
309-
$ignoreErrors[] = [
310-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeInsertBatch type has no value type specified in iterable type array\\.$#',
311-
'count' => 1,
312-
'path' => __DIR__ . '/system/BaseModel.php',
313-
];
314-
$ignoreErrors[] = [
315-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeUpdate type has no value type specified in iterable type array\\.$#',
316-
'count' => 1,
317-
'path' => __DIR__ . '/system/BaseModel.php',
318-
];
319-
$ignoreErrors[] = [
320-
'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeUpdateBatch type has no value type specified in iterable type array\\.$#',
321-
'count' => 1,
322-
'path' => __DIR__ . '/system/BaseModel.php',
323-
];
324264
$ignoreErrors[] = [
325265
'message' => '#^Strict comparison using \\!\\=\\= between mixed and null will always evaluate to true\\.$#',
326266
'count' => 1,
@@ -11116,71 +11056,11 @@
1111611056
'count' => 1,
1111711057
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
1111811058
];
11119-
$ignoreErrors[] = [
11120-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$afterDelete type has no value type specified in iterable type array\\.$#',
11121-
'count' => 1,
11122-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11123-
];
11124-
$ignoreErrors[] = [
11125-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$afterFind type has no value type specified in iterable type array\\.$#',
11126-
'count' => 1,
11127-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11128-
];
11129-
$ignoreErrors[] = [
11130-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$afterInsert type has no value type specified in iterable type array\\.$#',
11131-
'count' => 1,
11132-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11133-
];
11134-
$ignoreErrors[] = [
11135-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$afterInsertBatch type has no value type specified in iterable type array\\.$#',
11136-
'count' => 1,
11137-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11138-
];
11139-
$ignoreErrors[] = [
11140-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$afterUpdate type has no value type specified in iterable type array\\.$#',
11141-
'count' => 1,
11142-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11143-
];
11144-
$ignoreErrors[] = [
11145-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$afterUpdateBatch type has no value type specified in iterable type array\\.$#',
11146-
'count' => 1,
11147-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11148-
];
11149-
$ignoreErrors[] = [
11150-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$beforeDelete type has no value type specified in iterable type array\\.$#',
11151-
'count' => 1,
11152-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11153-
];
11154-
$ignoreErrors[] = [
11155-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$beforeFind type has no value type specified in iterable type array\\.$#',
11156-
'count' => 1,
11157-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11158-
];
1115911059
$ignoreErrors[] = [
1116011060
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$beforeFindReturnData has no type specified\\.$#',
1116111061
'count' => 1,
1116211062
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
1116311063
];
11164-
$ignoreErrors[] = [
11165-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$beforeInsert type has no value type specified in iterable type array\\.$#',
11166-
'count' => 1,
11167-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11168-
];
11169-
$ignoreErrors[] = [
11170-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$beforeInsertBatch type has no value type specified in iterable type array\\.$#',
11171-
'count' => 1,
11172-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11173-
];
11174-
$ignoreErrors[] = [
11175-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$beforeUpdate type has no value type specified in iterable type array\\.$#',
11176-
'count' => 1,
11177-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11178-
];
11179-
$ignoreErrors[] = [
11180-
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$beforeUpdateBatch type has no value type specified in iterable type array\\.$#',
11181-
'count' => 1,
11182-
'path' => __DIR__ . '/tests/_support/Models/EventModel.php',
11183-
];
1118411064
$ignoreErrors[] = [
1118511065
'message' => '#^Property Tests\\\\Support\\\\Models\\\\EventModel\\:\\:\\$eventData has no type specified\\.$#',
1118611066
'count' => 1,

‎system/BaseModel.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -246,84 +246,84 @@ abstract class BaseModel
246246
/**
247247
* Callbacks for beforeInsert
248248
*
249-
* @var array
249+
* @var list<string>
250250
*/
251251
protected $beforeInsert = [];
252252

253253
/**
254254
* Callbacks for afterInsert
255255
*
256-
* @var array
256+
* @var list<string>
257257
*/
258258
protected $afterInsert = [];
259259

260260
/**
261261
* Callbacks for beforeUpdate
262262
*
263-
* @var array
263+
* @var list<string>
264264
*/
265265
protected $beforeUpdate = [];
266266

267267
/**
268268
* Callbacks for afterUpdate
269269
*
270-
* @var array
270+
* @var list<string>
271271
*/
272272
protected $afterUpdate = [];
273273

274274
/**
275275
* Callbacks for beforeInsertBatch
276276
*
277-
* @var array
277+
* @var list<string>
278278
*/
279279
protected $beforeInsertBatch = [];
280280

281281
/**
282282
* Callbacks for afterInsertBatch
283283
*
284-
* @var array
284+
* @var list<string>
285285
*/
286286
protected $afterInsertBatch = [];
287287

288288
/**
289289
* Callbacks for beforeUpdateBatch
290290
*
291-
* @var array
291+
* @var list<string>
292292
*/
293293
protected $beforeUpdateBatch = [];
294294

295295
/**
296296
* Callbacks for afterUpdateBatch
297297
*
298-
* @var array
298+
* @var list<string>
299299
*/
300300
protected $afterUpdateBatch = [];
301301

302302
/**
303303
* Callbacks for beforeFind
304304
*
305-
* @var array
305+
* @var list<string>
306306
*/
307307
protected $beforeFind = [];
308308

309309
/**
310310
* Callbacks for afterFind
311311
*
312-
* @var array
312+
* @var list<string>
313313
*/
314314
protected $afterFind = [];
315315

316316
/**
317317
* Callbacks for beforeDelete
318318
*
319-
* @var array
319+
* @var list<string>
320320
*/
321321
protected $beforeDelete = [];
322322

323323
/**
324324
* Callbacks for afterDelete
325325
*
326-
* @var array
326+
* @var list<string>
327327
*/
328328
protected $afterDelete = [];
329329

0 commit comments

Comments
 (0)