fixed PHPStan errors

Author: dg

phpstan-baseline.neon

@@ -0,0 +1,19 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Method Nette\\Http\\IResponse\:\:setCookie\(\) invoked with 8 parameters, 3\-7 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/Bridges/SecurityHttp/CookieStorage.php
+
+		-
+			message: '#^Instanceof between string and Nette\\Security\\Role will always evaluate to false\.$#'
+			identifier: instanceof.alwaysFalse
+			count: 1
+			path: src/Security/User.php
+
+		-
+			message: '#^Parameter \#1 \$credentials of method Nette\\Security\\IAuthenticator\:\:authenticate\(\) expects array\{string, string\}, list\<mixed\> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Security/User.php

phpstan.neon

@@ -1,14 +1,15 @@
 parameters:
-	level: 5
+	level: 8
 
 	paths:
 		- src
 
-	treatPhpDocTypesAsCertain: false
-
-	ignoreErrors:
-		- '#Variable \$this in isset\(\) always exists and is not nullable\.#'
+	excludePaths:
+		- src/compatibility.php
 
+	fileExtensions:
+		- php
+		- phtml
 
 includes:
-	- vendor/phpstan/phpstan-nette/extension.neon
+	- phpstan-baseline.neon

src/Bridges/SecurityDI/SecurityExtension.php

@@ -134,7 +134,9 @@ public function beforeCompile(): void
 			$this->debugMode &&
 			($this->config->debugger ?? $builder->getByType(Tracy\Bar::class))
 		) {
-			$builder->getDefinition($this->prefix('user'))->addSetup('@Tracy\Bar::addPanel', [
+			$definition = $builder->getDefinition($this->prefix('user'));
+			assert($definition instanceof Nette\DI\Definitions\ServiceDefinition);
+			$definition->addSetup('@Tracy\Bar::addPanel', [
 				new Nette\DI\Definitions\Statement(Nette\Bridges\SecurityTracy\UserPanel::class),
 			]);
 		}

src/Bridges/SecurityHttp/SessionStorage.php

@@ -64,9 +64,7 @@ public function clearAuthentication(bool $clearIdentity): void
 	public function getState(): array
 	{
 		$section = $this->getSessionSection();
-		return $section
-			? [(bool) $section->get('authenticated'), $section->get('identity'), $section->get('reason')]
-			: [false, null, null];
+		return [(bool) $section->get('authenticated'), $section->get('identity'), $section->get('reason')];
 	}
 
 
@@ -83,6 +81,7 @@ public function setExpiration(?string $time, bool $clearIdentity = false): void
 
 	private function setupExpiration(): void
 	{
+		assert($this->sessionSection !== null);
 		$section = $this->sessionSection;
 		if ($this->expireTime) {
 			$section->set('expireTime', $this->expireTime);
@@ -122,7 +121,7 @@ public function getNamespace(): string
 	/**
 	 * Returns and initializes $this->sessionSection.
 	 */
-	private function getSessionSection(): ?SessionSection
+	private function getSessionSection(): SessionSection
 	{
 		if ($this->sessionSection !== null) {
 			return $this->sessionSection;

src/Bridges/SecurityTracy/dist/panel.phtml

@@ -1,5 +1,5 @@
 <?php declare(strict_types=1); ?>
-<h1><?php if ($user->isLoggedIn()): ?>
+<?php /** @var Nette\Security\User $user */ ?><h1><?php if ($user->isLoggedIn()): ?>
 Logged in<?php else: ?>
 Unlogged<?php endif ?>
 </h1>

src/Bridges/SecurityTracy/dist/tab.phtml

@@ -1,5 +1,5 @@
 <?php declare(strict_types=1); ?>
-<?php $messages = [true => 'Logged in', false => 'Unlogged', '?' => 'Session is closed'] ?><?php $colors = [true => '#61A519', false => '#ababab', '?' => '#bb0000'] ?><span title="<?= Tracy\Helpers::escapeHtml($messages[$status]) ?>
+<?php /** @var string|bool $status */ ?><?php $messages = [true => 'Logged in', false => 'Unlogged', '?' => 'Session is closed'] ?><?php $colors = [true => '#61A519', false => '#ababab', '?' => '#bb0000'] ?><span title="<?= Tracy\Helpers::escapeHtml($messages[$status]) ?>
 ">
 	<svg viewBox="0 -50 2048 2048">
 		<path fill="<?= Tracy\Helpers::escapeHtml($colors[$status]) ?>

src/Bridges/SecurityTracy/panel.latte

@@ -1,3 +1,4 @@
+{varType Nette\Security\User $user}
 <h1>{if $user->isLoggedIn()}Logged in{else}Unlogged{/if}</h1>
 
 <div class="tracy-inner nette-UserPanel">

src/Bridges/SecurityTracy/tab.latte

@@ -1,3 +1,4 @@
+{varType string|bool $status}
 {do $messages = [true => 'Logged in', false => Unlogged, '?' => 'Session is closed']}
 {do $colors = [true => '#61A519', false => '#ababab', '?' => '#bb0000']}
 <span title="{$messages[$status]}">

src/Security/Identity.php

@@ -96,12 +96,12 @@ public function getData(): array
 	 */
 	public function __set(string $key, mixed $value): void
 	{
-		if (in_array($key, ['id', 'roles', 'data'], strict: true)) {
-			$this->{"set$key"}($value);
-
-		} else {
-			$this->data[$key] = $value;
-		}
+		match ($key) {
+			'id' => $this->setId($value),
+			'roles' => $this->setRoles($value),
+			'data' => $this->data = $value,
+			default => $this->data[$key] = $value,
+		};
 	}
 
 
@@ -111,7 +111,7 @@ public function __set(string $key, mixed $value): void
 	public function &__get(string $key): mixed
 	{
 		if (in_array($key, ['id', 'roles', 'data'], strict: true)) {
-			$res = $this->{"get$key"}();
+			$res = $this->{'get' . ucfirst($key)}();
 			return $res;
 
 		} else {

src/Security/Passwords.php

@@ -41,7 +41,7 @@ public function hash(
 
 		$hash = @password_hash($password, $this->algo, $this->options); // @ is escalated to exception
 		if (!$hash) {
-			throw new Nette\InvalidStateException('Computed hash is invalid. ' . error_get_last()['message']);
+			throw new Nette\InvalidStateException('Computed hash is invalid. ' . (error_get_last()['message'] ?? ''));
 		}
 
 		return $hash;