Use an assertion to clear up phpstan's confusion about nulls

PennyDreadfulMTG · Oct 8, 2024 · 1e3ac98 · 1e3ac98
1 parent 7160ffc
commit 1e3ac98
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/gatherling/Auth/Login.php b/gatherling/Auth/Login.php
@@ -21,6 +21,7 @@ public static function login(?string $username, ?string $password): LoginResult
         if ($errors) {
             return new LoginResult(false, $errors);
         }
+        assert(is_string($username) && is_string($password));
         $auth = Player::checkPassword($username, $password);
         // The $admin check allows an admin to su into any user without a password.
         $admin = Player::isLoggedIn() && Player::getSessionPlayer()->isSuper();

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5,21 +5,6 @@ parameters:
 			count: 1
 			path: gatherling/Auth/Login.php
 
-		-
-			message: "#^Parameter \\#1 \\$string of function strlen expects string, string\\|null given\\.$#"
-			count: 1
-			path: gatherling/Auth/Login.php
-
-		-
-			message: "#^Parameter \\#1 \\$username of static method Gatherling\\\\Models\\\\Player\\:\\:checkPassword\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: gatherling/Auth/Login.php
-
-		-
-			message: "#^Parameter \\#2 \\$password of static method Gatherling\\\\Models\\\\Player\\:\\:checkPassword\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: gatherling/Auth/Login.php
-
 		-
 			message: "#^Cannot access property \\$discord_handle on Gatherling\\\\Models\\\\Player\\|null\\.$#"
 			count: 1