From 409c63dcf8733e4ad8bb54a1f43e987b3d2f2fe5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 29 Nov 2021 12:30:33 +0300
Subject: [PATCH] remove mixed type hints from function arguments because we
still support PHP7
---
classes/api.php | 2 +-
classes/feeds.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/classes/api.php b/classes/api.php
index 539aa334b..213ccb7e6 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -633,7 +633,7 @@ class API extends Handler {
* @param string|int $feed_id
* @return array{0: array<int, array<string, mixed>>, 1: array<string, mixed>} $headlines, $headlines_header
*/
- private static function _api_get_headlines(mixed $feed_id, int $limit, int $offset,
+ private static function _api_get_headlines($feed_id, int $limit, int $offset,
string $filter, bool $is_cat, bool $show_excerpt, bool $show_content, ?string $view_mode, string $order,
bool $include_attachments, int $since_id, string $search = "", bool $include_nested = false,
bool $sanitize_content = true, bool $force_update = false, int $excerpt_length = 100, ?int $check_first_id = null,
diff --git a/classes/feeds.php b/classes/feeds.php
index af2ee1a8c..a9afb70f2 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -21,7 +21,7 @@ class Feeds extends Handler_Protected {
* @param string|int $feed
* @return array{0: array<int, int>, 1: int, 2: int, 3: bool, 4: array<string, mixed>} $topmost_article_ids, $headlines_count, $feed, $disable_cache, $reply
*/
- private function _format_headlines_list(mixed $feed, string $method, string $view_mode, int $limit, bool $cat_view,
+ private function _format_headlines_list($feed, string $method, string $view_mode, int $limit, bool $cat_view,
int $offset, string $override_order, bool $include_children, ?int $check_first_id = null,
bool $skip_first_id_check, string $order_by): array {
@@ -1217,7 +1217,7 @@ class Feeds extends Handler_Protected {
/**
* @param string|int $id
*/
- static function _get_title(mixed $id, bool $cat = false): string {
+ static function _get_title($id, bool $cat = false): string {
$pdo = Db::pdo();
if ($cat) {
--
GitLab