From a81656c3ed5b8fe0f31794a4fbe0d1a907fca8e8 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite 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/Models/FormAuth.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'app/Models/FormAuth.php') diff --git a/app/Models/FormAuth.php b/app/Models/FormAuth.php index a8b4dab8a..5bd6d97bc 100644 --- a/app/Models/FormAuth.php +++ b/app/Models/FormAuth.php @@ -38,8 +38,7 @@ class FreshRSS_FormAuth { return []; } - /** @return string|false */ - private static function renewCookie(string $token) { + private static function renewCookie(string $token): string|false { $token_file = DATA_PATH . '/tokens/' . $token . '.txt'; if (touch($token_file)) { $limits = FreshRSS_Context::systemConf()->limits; @@ -51,8 +50,7 @@ class FreshRSS_FormAuth { return false; } - /** @return string|false */ - public static function makeCookie(string $username, string $password_hash) { + public static function makeCookie(string $username, string $password_hash): string|false { do { $token = sha1(FreshRSS_Context::systemConf()->salt . $username . uniqid('' . mt_rand(), true)); $token_file = DATA_PATH . '/tokens/' . $token . '.txt'; -- cgit v1.2.3