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
---
 lib/Minz/Extension.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

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

diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index 95d28af8a..69b9c569c 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -105,7 +105,7 @@ abstract class Minz_Extension {
 	 *
 	 * @return string|false html content from ext_dir/configure.phtml, false if it does not exist.
 	 */
-	final public function getConfigureView() {
+	final public function getConfigureView(): string|false {
 		$filename = $this->path . '/configure.phtml';
 		if (!file_exists($filename)) {
 			return false;
@@ -146,7 +146,7 @@ abstract class Minz_Extension {
 		return $this->version;
 	}
 	/** @return 'system'|'user' */
-	final public function getType() {
+	final public function getType(): string {
 		return $this->type;
 	}
 
@@ -296,11 +296,7 @@ abstract class Minz_Extension {
 		return [];
 	}
 
-	/**
-	 * @param mixed $default
-	 * @return mixed
-	 */
-	final public function getSystemConfigurationValue(string $key, $default = null) {
+	final public function getSystemConfigurationValue(string $key, mixed $default = null): mixed {
 		if (!is_array($this->system_configuration)) {
 			$this->system_configuration = $this->getSystemConfiguration();
 		}
@@ -311,11 +307,7 @@ abstract class Minz_Extension {
 		return $default;
 	}
 
-	/**
-	 * @param mixed $default
-	 * @return mixed
-	 */
-	final public function getUserConfigurationValue(string $key, $default = null) {
+	final public function getUserConfigurationValue(string $key, mixed $default = null): mixed {
 		if (!is_array($this->user_configuration)) {
 			$this->user_configuration = $this->getUserConfiguration();
 		}
-- 
cgit v1.2.3