diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-03-22 09:57:31 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-03-22 09:57:31 +0100 |
| commit | e750448f5b32982170f81ca045f9f7e8dc8eed6f (patch) | |
| tree | 4053a9bfdcc5764cdc8ed93e9be73f54da7bd9d4 /app/Controllers | |
| parent | 1a0616562db5c096dc7ca187f0210b3d57bffebf (diff) | |
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
Diffstat (limited to 'app/Controllers')
| -rw-r--r-- | app/Controllers/feedController.php | 2 | ||||
| -rw-r--r-- | app/Controllers/importExportController.php | 2 | ||||
| -rw-r--r-- | app/Controllers/indexController.php | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 84f38fe5e..2fcc5eda6 100644 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -906,7 +906,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { ]); //Get parameters. - $feed_id = Minz_Request::param('id'); + $feed_id = (int)(Minz_Request::param('id', 0)); $content_selector = trim(Minz_Request::param('selector')); if (!$content_selector) { diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 962abb160..5066ff124 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -357,7 +357,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { // For each feed, check existing GUIDs already in database. $existingHashForGuids = array(); foreach ($newFeedGuids as $feedId => $newGuids) { - $existingHashForGuids[$feedId] = $this->entryDAO->listHashForFeedGuids(substr($feedId, 2), $newGuids); + $existingHashForGuids[$feedId] = $this->entryDAO->listHashForFeedGuids((int)substr($feedId, 2), $newGuids); } unset($newFeedGuids); diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 9cb235d21..115117a8f 100644 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -251,10 +251,10 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController { $get = FreshRSS_Context::currentGet(true); if (is_array($get)) { $type = $get[0]; - $id = $get[1]; + $id = (int)($get[1]); } else { $type = $get; - $id = ''; + $id = 0; } $limit = FreshRSS_Context::$number; |