From 029cb8f4420a99aef225413f3c32ec1db35717a8 Mon Sep 17 00:00:00 2001 From: wn_ Date: Sun, 5 Mar 2023 16:29:51 +0000 Subject: Revert 7ed4fa4c1dbdd9df552cf6dd28907c6769911a0e and use @var instead. PHPStan had trouble recognizing that ['items'] might have elements added. --- classes/pref/feeds.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'classes/pref/feeds.php') diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index d8b2ba01a..36dfbef76 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -241,7 +241,12 @@ class Pref_Feeds extends Handler_Protected { //$root['param'] += count($cat['items']); } - /* Uncategorized is a special case */ + /** + * Uncategorized is a special case. + * + * Define a minimal array shape to help PHPStan with the type of $cat['items'] + * @var array{items: array>} $cat + */ $cat = [ 'id' => 'CAT:0', 'bare_id' => 0, @@ -267,7 +272,7 @@ class Pref_Feeds extends Handler_Protected { } foreach ($feeds_obj->find_many() as $feed) { - $cat['items'][] = [ + array_push($cat['items'], [ 'id' => 'FEED:' . $feed->id, 'bare_id' => (int) $feed->id, 'auxcounter' => -1, @@ -279,7 +284,7 @@ class Pref_Feeds extends Handler_Protected { 'unread' => -1, 'type' => 'feed', 'updates_disabled' => (int)($feed->update_interval < 0), - ]; + ]); } $cat['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items'])); -- cgit v1.2.3