diff options
| author | 2024-09-06 09:06:46 +0200 | |
|---|---|---|
| committer | 2024-09-06 09:06:46 +0200 | |
| commit | a81656c3ed5b8fe0f31794a4fbe0d1a907fca8e8 (patch) | |
| tree | 8bf49bd876aaebc985a9fb1214863190a799cbee /app/Services | |
| parent | 8f7c3473a76809efc88814253722c76f0cc8eb04 (diff) | |
Upgrade to PHP 8.1 (#6711)
* Upgrade to PHP 8.1
As discussed in https://github.com/FreshRSS/FreshRSS/discussions/5474
https://www.php.net/releases/8.0/en.php
https://www.php.net/releases/8.1/en.php
Upgrade to available native type declarations
https://php.net/language.types.declarations
Upgrade to https://phpunit.de/announcements/phpunit-10.html which requires PHP 8.1+ (good timing, as version 9 was not maintained anymore)
Upgrade `:oldest` Docker dev image to oldest Alpine version supporting PHP 8.1: Alpine 3.16, which includes PHP 8.1.22.
* Include 6736
https://github.com/FreshRSS/FreshRSS/pull/6736
Diffstat (limited to 'app/Services')
| -rw-r--r-- | app/Services/ExportService.php | 17 | ||||
| -rw-r--r-- | app/Services/ImportService.php | 12 |
2 files changed, 11 insertions, 18 deletions
diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php index 91c8c91e3..ba4042d21 100644 --- a/app/Services/ExportService.php +++ b/app/Services/ExportService.php @@ -16,13 +16,13 @@ class FreshRSS_Export_Service { private FreshRSS_TagDAO $tag_dao; - public const FRSS_NAMESPACE = 'https://freshrss.org/opml'; - public const TYPE_HTML_XPATH = 'HTML+XPath'; - public const TYPE_XML_XPATH = 'XML+XPath'; - public const TYPE_RSS_ATOM = 'rss'; - public const TYPE_JSON_DOTPATH = 'JSON+DotPath'; // Legacy 1.24.0-dev - public const TYPE_JSON_DOTNOTATION = 'JSON+DotNotation'; - public const TYPE_JSONFEED = 'JSONFeed'; + final public const FRSS_NAMESPACE = 'https://freshrss.org/opml'; + final public const TYPE_HTML_XPATH = 'HTML+XPath'; + final public const TYPE_XML_XPATH = 'XML+XPath'; + final public const TYPE_RSS_ATOM = 'rss'; + final public const TYPE_JSON_DOTPATH = 'JSON+DotPath'; // Legacy 1.24.0-dev + final public const TYPE_JSON_DOTNOTATION = 'JSON+DotNotation'; + final public const TYPE_JSONFEED = 'JSONFeed'; /** * Initialize the service for the given user. @@ -87,8 +87,6 @@ class FreshRSS_Export_Service { /** * Generate the entries file content for the given feed. - * @param int $feed_id - * @param int $max_number_entries * @return array{0:string,1:string}|null First item is the filename, second item is the content. * It also can return null if the feed doesn’t exist. */ @@ -124,7 +122,6 @@ class FreshRSS_Export_Service { /** * Generate the entries file content for all the feeds. - * @param int $max_number_entries * @return array<string,string> Keys are filenames and values are contents. */ public function generateAllFeedEntries(int $max_number_entries): array { diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index 11da49217..8060e4d51 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -362,10 +362,8 @@ class FreshRSS_Import_Service { * This method is applied to a list of outlines. It merges the different * list of feeds from several outlines into one array. * - * @param array<array<mixed>> $outlines - * The outlines from which to extract the outlines. - * @param string $parent_category_name - * The name of the parent category of the current outlines. + * @param array<array<mixed>> $outlines The outlines from which to extract the outlines. + * @param string $parent_category_name The name of the parent category of the current outlines. * @return array{0:array<string,array<string,string>>,1:array<string,array<array<string,string>>>} */ private function loadFromOutlines(array $outlines, string $parent_category_name): array { @@ -405,10 +403,8 @@ class FreshRSS_Import_Service { * exists), it will add the outline to an array accessible by its category * name. * - * @param array<mixed> $outline - * The outline from which to extract the categories and feeds outlines. - * @param string $parent_category_name - * The name of the parent category of the current outline. + * @param array<mixed> $outline The outline from which to extract the categories and feeds outlines. + * @param string $parent_category_name The name of the parent category of the current outline. * * @return array{0:array<string,array<string,string>>,1:array<array<string,array<string,string>>>} */ |
