From a80a5f48a16e7d232168a7aaa68e9a1804235ce1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 18 Dec 2023 17:59:16 +0100
Subject: Pass PHPStan level 8 (#5946)

* Pass PHPStan level 8
And prepare for PHPStan level 9 https://phpstan.org/user-guide/rule-levels

* Revert wrong replace in comment

* Fix PHPStan level 8

* Update PHPStan and other dev dependencies

* Remove obsolete comment

* noVariableVariables and towards bleedingEdge
https://github.com/phpstan/phpstan-strict-rules
https://phpstan.org/blog/what-is-bleeding-edge

* More bleedingEdge

* A bit more PHPStan level 9

* More PHPStan level 9

* Prepare for booleansInConditions
Ignore int and null

* Revert wrong line

* More fixes

* Fix keep_max_n_unread

* Stricter attribute functions

* Stricter callHooks and more PHPStan level 9

* More typing

* A tiny more
---
 lib/Minz/Request.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 0ac1a9fe3..f39982be1 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -58,7 +58,7 @@ class Minz_Request {
 		}
 	}
 
-	/** @return array<string|int,string|array<string,string>> */
+	/** @return array<string|int,string|array<string,string|int>> */
 	public static function paramArray(string $key, bool $specialchars = false): array {
 		if (empty(self::$params[$key]) || !is_array(self::$params[$key])) {
 			return [];
@@ -89,8 +89,8 @@ class Minz_Request {
 	}
 
 	public static function paramInt(string $key): int {
-		if (!empty(self::$params[$key])) {
-			return intval(self::$params[$key]);
+		if (!empty(self::$params[$key]) && is_numeric(self::$params[$key])) {
+			return (int)self::$params[$key];
 		}
 		return 0;
 	}
@@ -119,7 +119,7 @@ class Minz_Request {
 	 * @return array<string>
 	 */
 	public static function paramTextToArray(string $key, array $default = []): array {
-		if (isset(self::$params[$key])) {
+		if (isset(self::$params[$key]) && is_string(self::$params[$key])) {
 			return preg_split('/\R/', self::$params[$key]) ?: [];
 		}
 		return $default;
@@ -431,7 +431,7 @@ class Minz_Request {
 		if ($ORIGINAL_INPUT == false) {
 			return;
 		}
-		if (null === $json = json_decode($ORIGINAL_INPUT, true)) {
+		if (!is_array($json = json_decode($ORIGINAL_INPUT, true))) {
 			return;
 		}
 
-- 
cgit v1.2.3