From e750448f5b32982170f81ca045f9f7e8dc8eed6f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 22 Mar 2023 09:57:31 +0100 Subject: Consistent entry ID type (32-bit compatibility) (#5213) * Remove FreshRSS_Searchable for better types The interface was not used, and it was preventing more precise types for the different `searchById()` methods, as they each have different input and output types. * Consistent entry ID Entry IDs (which are 64-bit integers) must be processed as string to be compatible with 32-bit platforms * Fix type * A few more related types * PHPStan level 6 * Some more casts needed * String cast for htmlspecialchars --- app/Services/ExportService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/Services/ExportService.php') diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php index 6b0a3f178..b09be1011 100644 --- a/app/Services/ExportService.php +++ b/app/Services/ExportService.php @@ -76,12 +76,12 @@ class FreshRSS_Export_Service { $view->list_title = _t('sub.import_export.starred_list'); $view->type = 'starred'; $entriesId = $this->entry_dao->listIdsWhere( - $type, '', FreshRSS_Entry::STATE_ALL, 'ASC', -1 + $type, 0, FreshRSS_Entry::STATE_ALL, 'ASC', -1 ); $view->entryIdsTagNames = $this->tag_dao->getEntryIdsTagNames($entriesId); // The following is a streamable query, i.e. must be last $view->entries = $this->entry_dao->listWhere( - $type, '', FreshRSS_Entry::STATE_ALL, 'ASC', -1 + $type, 0, FreshRSS_Entry::STATE_ALL, 'ASC', -1 ); return [ -- cgit v1.2.3