Src: modernize to PHP 8.2+

Author: claude

src/Auth/DebugAuthenticator.php

@@ -10,36 +10,30 @@
 class DebugAuthenticator implements Authenticator
 {
 
-	/** @var bool */
-	private $pass;
+	private ?IIdentity $identity = null;
 
-	/** @var IIdentity|null */
-	private $identity;
-
-	public function __construct(bool $pass = true)
+	public function __construct(
+		private readonly bool $pass = true,
+	)
 	{
-		$this->pass = $pass;
 	}
 
 	public function setIdentity(IIdentity $identity): void
 	{
 		$this->identity = $identity;
 	}
 
-	/**
-	 * @throws AuthenticationException
-	 */
 	public function authenticate(string $username, string $password): IIdentity
 	{
 		if ($this->pass === false) {
-			throw new AuthenticationException('Cannot login', Authenticator::FAILURE);
+			throw new AuthenticationException('Cannot login', Authenticator::Failure);
 		}
 
 		if ($this->identity !== null) {
 			return $this->identity;
 		}
 
-		return new SimpleIdentity(1, null, null);
+		return new SimpleIdentity(1);
 	}
 
 }

src/Auth/StaticAuthenticator.php

@@ -12,40 +12,38 @@
 class StaticAuthenticator implements Authenticator
 {
 
-	/** @var mixed[][] */
-	private $list;
-
-	/** @var Passwords */
-	private $passwords;
+	/** @var array<string, array{password: string, unsecured: bool, identity: IIdentity}> */
+	private array $list = [];
 
 	/**
-	 * @param mixed[] $list
-	 * @throws InvalidArgumentException
+	 * @param array<string, array<string, mixed>> $list
 	 */
-	public function __construct(array $list, Passwords $passwords)
+	public function __construct(
+		array $list,
+		private readonly Passwords $passwords,
+	)
 	{
 		foreach ($list as $username => $values) {
 			if (!isset($values['password'])) {
 				throw new InvalidArgumentException(sprintf('Missing parameter `password` for user `%s`', $username));
 			}
 
+			if (!is_string($values['password'])) {
+				throw new InvalidArgumentException(sprintf('Password for user `%s` must be a string', $username));
+			}
+
 			$this->list[$username] = [
 				'password' => $values['password'],
-				'unsecured' => $values['unsecured'] ?? false,
+				'unsecured' => (bool) ($values['unsecured'] ?? false),
 				'identity' => $this->createIdentity($username, $values),
 			];
 		}
-
-		$this->passwords = $passwords;
 	}
 
-	/**
-	 * @throws AuthenticationException
-	 */
 	public function authenticate(string $username, string $password): IIdentity
 	{
 		if (!isset($this->list[$username])) {
-			throw new AuthenticationException(sprintf('User `%s` not found', $username), Authenticator::IDENTITY_NOT_FOUND);
+			throw new AuthenticationException(sprintf('User `%s` not found', $username), Authenticator::IdentityNotFound);
 		}
 
 		$user = $this->list[$username];
@@ -54,14 +52,14 @@ public function authenticate(string $username, string $password): IIdentity
 			($user['unsecured'] === true && !hash_equals($password, $user['password'])) ||
 			($user['unsecured'] === false && !$this->passwords->verify($password, $user['password']))
 		) {
-			throw new AuthenticationException('Invalid password', Authenticator::INVALID_CREDENTIAL);
+			throw new AuthenticationException('Invalid password', Authenticator::InvalidCredential);
 		}
 
 		return $user['identity'];
 	}
 
 	/**
-	 * @param mixed[] $values
+	 * @param array<string, mixed> $values
 	 */
 	private function createIdentity(string $username, array $values): IIdentity
 	{
@@ -75,11 +73,15 @@ private function createIdentity(string $username, array $values): IIdentity
 			return $identity;
 		}
 
-		if (is_array($values['identity'])) {
+		if (is_array($identity)) {
+			$id = $identity['id'] ?? $username;
+			$roles = $identity['roles'] ?? null;
+			$data = $identity['data'] ?? null;
+
 			return new SimpleIdentity(
-				$identity['id'] ?? $username,
-				$identity['roles'] ?? null,
-				$identity['date'] ?? null
+				is_scalar($id) ? (string) $id : $username,
+				is_array($roles) ? $roles : null,
+				is_array($data) ? $data : null
 			);
 		}