From a81656c3ed5b8fe0f31794a4fbe0d1a907fca8e8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 6 Sep 2024 09:06:46 +0200
Subject: 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
---
 app/Services/ImportService.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'app/Services/ImportService.php')

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>>>}
 	 */
-- 
cgit v1.2.3