From 06d00995049db9c7b915f67cfd4a5708aace458f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 30 Oct 2023 20:47:27 +0100 Subject: Require PHP 7.4+ (#5720) * Require PHP 7.4+ https://github.com/FreshRSS/FreshRSS/discussions/5474 * Update Docker oldest Alpine 3.13 with PHP 7.4.26 * Add missing packets to Docker oldest * Update to typed properties https://php.net/migration74.new-features#migration74.new-features.core.typed-properties * More types --- app/Services/ExportService.php | 16 ++++++---------- app/Services/ImportService.php | 11 +++++------ 2 files changed, 11 insertions(+), 16 deletions(-) (limited to 'app/Services') diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php index d3a3373a5..80531f3fc 100644 --- a/app/Services/ExportService.php +++ b/app/Services/ExportService.php @@ -4,20 +4,16 @@ * Provide useful methods to generate files to export. */ class FreshRSS_Export_Service { - /** @var string */ - private $username; - /** @var FreshRSS_CategoryDAO */ - private $category_dao; + private string $username; - /** @var FreshRSS_FeedDAO */ - private $feed_dao; + private FreshRSS_CategoryDAO $category_dao; - /** @var FreshRSS_EntryDAO */ - private $entry_dao; + private FreshRSS_FeedDAO $feed_dao; - /** @var FreshRSS_TagDAO */ - private $tag_dao; + private FreshRSS_EntryDAO $entry_dao; + + private FreshRSS_TagDAO $tag_dao; public const FRSS_NAMESPACE = 'https://freshrss.org/opml'; public const TYPE_HTML_XPATH = 'HTML+XPath'; diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index b70627295..9b013fea4 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -4,14 +4,13 @@ * Provide methods to import files. */ class FreshRSS_Import_Service { - /** @var FreshRSS_CategoryDAO */ - private $catDAO; - /** @var FreshRSS_FeedDAO */ - private $feedDAO; + private FreshRSS_CategoryDAO $catDAO; - /** @var bool true if success, false otherwise */ - private $lastStatus; + private FreshRSS_FeedDAO $feedDAO; + + /** true if success, false otherwise */ + private bool $lastStatus; /** * Initialize the service for the given user. -- cgit v1.2.3