From b1d24fbdb7d1cc948c946295035dad6df550fb7e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 27 Dec 2024 12:12:49 +0100
Subject: PHPStan 2.0 (#7131)

* PHPStan 2.0
fix https://github.com/FreshRSS/FreshRSS/issues/6989
https://github.com/phpstan/phpstan/releases/tag/2.0.0
https://github.com/phpstan/phpstan/blob/2.0.x/UPGRADING.md

* More

* More

* Done

* fix i18n CLI

* Restore a PHPStan Next test
For work towards PHPStan Level 10

* 4 more on Level 10

* fix getTagsForEntry

* API at Level 10

* More Level 10

* Finish Minz at Level 10

* Finish CLI at Level 10

* Finish Controllers at Level 10

* More Level 10

* More

* Pass bleedingEdge

* Clean PHPStan options and add TODOs

* Level 10 for main config

* More

* Consitency array vs. list

* Sanitize themes get_infos

* Simplify TagDAO->getTagsForEntries()

* Finish reportAnyTypeWideningInVarTag

* Prepare checkBenevolentUnionTypes and checkImplicitMixed

* Fixes

* Refix

* Another fix

* Casing of __METHOD__ constant
---
 lib/Minz/Error.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/Minz/Error.php')

diff --git a/lib/Minz/Error.php b/lib/Minz/Error.php
index 74a71de0a..e95fd346c 100644
--- a/lib/Minz/Error.php
+++ b/lib/Minz/Error.php
@@ -15,13 +15,13 @@ class Minz_Error {
 	/**
 	* Permet de lancer une erreur
 	* @param int $code le type de l'erreur, par défaut 404 (page not found)
-	* @param string|array<'error'|'warning'|'notice',array<string>> $logs logs d'erreurs découpés de la forme
+	* @param string|array<'error'|'warning'|'notice',list<string>> $logs logs d'erreurs découpés de la forme
 	*      > $logs['error']
 	*      > $logs['warning']
 	*      > $logs['notice']
 	* @param bool $redirect indique s'il faut forcer la redirection (les logs ne seront pas transmis)
 	*/
-	public static function error(int $code = 404, $logs = [], bool $redirect = true): void {
+	public static function error(int $code = 404, string|array $logs = [], bool $redirect = true): void {
 		$logs = self::processLogs($logs);
 		$error_filename = APP_PATH . '/Controllers/errorController.php';
 
@@ -49,8 +49,8 @@ class Minz_Error {
 
 	/**
 	 * Returns filtered logs
-	 * @param string|array<'error'|'warning'|'notice',array<string>> $logs logs sorted by category (error, warning, notice)
-	 * @return array<string> list of matching logs, without the category, according to environment preferences (production / development)
+	 * @param string|array<'error'|'warning'|'notice',list<string>> $logs logs sorted by category (error, warning, notice)
+	 * @return list<string> list of matching logs, without the category, according to environment preferences (production / development)
 	 */
 	private static function processLogs($logs): array {
 		if (is_string($logs)) {
@@ -61,13 +61,13 @@ class Minz_Error {
 		$warning = [];
 		$notice = [];
 
-		if (isset($logs['error']) && is_array($logs['error'])) {
+		if (is_array($logs['error'] ?? null)) {
 			$error = $logs['error'];
 		}
-		if (isset($logs['warning']) && is_array($logs['warning'])) {
+		if (is_array($logs['warning'] ?? null)) {
 			$warning = $logs['warning'];
 		}
-		if (isset($logs['notice']) && is_array($logs['notice'])) {
+		if (is_array($logs['notice'] ?? null)) {
 			$notice = $logs['notice'];
 		}
 
-- 
cgit v1.2.3