From 47e242aa77bb8583e8716023c4bcef0462891ebd Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 30 Jan 2022 15:53:17 +0100
Subject: Fix ctype_alnum (#4182)

* Fix ctype_alnum
#fix https://github.com/FreshRSS/FreshRSS/issues/4180
Ensure `ctype_alnum()` gets a string

* Changelog
---
 lib/Minz/ExtensionManager.php | 4 ++--
 lib/Minz/Session.php          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index cad408aed..17977fb0c 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -139,10 +139,10 @@ class Minz_ExtensionManager {
 	 * If the extension class name is `TestExtension`, entry point will be `Test`.
 	 * `entry_point` must be composed of alphanumeric characters.
 	 *
-	 * @param array $meta is an array of values.
+	 * @param array<string> $meta is an array of values.
 	 * @return bool true if the array is valid, false else.
 	 */
-	public static function isValidMetadata($meta) {
+	public static function isValidMetadata($meta): bool {
 		$valid_chars = array('_');
 		return !(empty($meta['name']) || empty($meta['entrypoint']) || !ctype_alnum(str_replace($valid_chars, '', $meta['entrypoint'])));
 	}
diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index d735f7949..924e9f5f9 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -150,12 +150,12 @@ class Minz_Session {
 		setcookie($name, '', 1, '', '', Minz_Request::isHttps(), true);
 	}
 
-	public static function setLongTermCookie($name, $value, $expire) {
+	public static function setLongTermCookie(string $name, string $value, $expire) {
 		setcookie($name, $value, $expire, '', '', Minz_Request::isHttps(), true);
 	}
 
-	public static function getLongTermCookie($name) {
-		return isset($_COOKIE[$name]) ? $_COOKIE[$name] : null;
+	public static function getLongTermCookie(string $name): string {
+		return isset($_COOKIE[$name]) ? $_COOKIE[$name] : '';
 	}
 
 }
-- 
cgit v1.2.3