added property typehints

Author: dg

src/Bridges/SecurityDI/SecurityExtension.php

@@ -19,8 +19,7 @@
  */
 class SecurityExtension extends Nette\DI\CompilerExtension
 {
-	/** @var bool */
-	private $debugMode;
+	private bool $debugMode;
 
 
 	public function __construct(bool $debugMode = false)

src/Bridges/SecurityHttp/CookieStorage.php

@@ -23,26 +23,13 @@ final class CookieStorage implements Nette\Security\UserStorage
 
 	private const MinLength = 13;
 
-	/** @var Http\IRequest */
-	private $request;
-
-	/** @var Http\IResponse */
-	private $response;
-
-	/** @var ?string */
-	private $uid;
-
-	/** @var string */
-	private $cookieName = 'userid';
-
-	/** @var ?string */
-	private $cookieDomain;
-
-	/** @var string */
-	private $cookieSameSite = 'Lax';
-
-	/** @var ?string */
-	private $cookieExpiration;
+	private Http\IRequest $request;
+	private Http\IResponse $response;
+	private ?string $uid = null;
+	private string $cookieName = 'userid';
+	private ?string $cookieDomain = null;
+	private string $cookieSameSite = 'Lax';
+	private ?string $cookieExpiration = null;
 
 
 	public function __construct(Http\IRequest $request, Http\IResponse $response)

src/Bridges/SecurityHttp/SessionStorage.php

@@ -22,20 +22,11 @@ final class SessionStorage implements Nette\Security\UserStorage
 {
 	use Nette\SmartObject;
 
-	/** @var string */
-	private $namespace = '';
-
-	/** @var Session */
-	private $sessionHandler;
-
-	/** @var SessionSection */
-	private $sessionSection;
-
-	/** @var ?int */
-	private $expireTime;
-
-	/** @var bool */
-	private $expireIdentity = false;
+	private string $namespace = '';
+	private Session $sessionHandler;
+	private ?SessionSection $sessionSection = null;
+	private ?int $expireTime = null;
+	private bool $expireIdentity = false;
 
 
 	public function __construct(Session $sessionHandler)

src/Bridges/SecurityTracy/UserPanel.php

@@ -20,8 +20,7 @@ class UserPanel implements Tracy\IBarPanel
 {
 	use Nette\SmartObject;
 
-	/** @var Nette\Security\User */
-	private $user;
+	private Nette\Security\User $user;
 
 
 	public function __construct(Nette\Security\User $user)

src/Security/Identity.php

@@ -14,7 +14,7 @@
 
 /**
  * @deprecated  use Nette\Security\SimpleIdentity
- * @property   mixed $id
+ * @property   string|int $id
  * @property   array $roles
  * @property   array $data
  */
@@ -26,14 +26,9 @@ class Identity implements IIdentity
 		__isset as private parentIsSet;
 	}
 
-	/** @var mixed */
-	private $id;
-
-	/** @var array */
-	private $roles;
-
-	/** @var array */
-	private $data;
+	private string|int $id;
+	private array $roles;
+	private array $data;
 
 
 	public function __construct($id, $roles = null, ?iterable $data = null)

src/Security/Passwords.php

@@ -19,11 +19,8 @@ class Passwords
 {
 	use Nette\SmartObject;
 
-	/** @var int|string  string since PHP 7.4 */
-	private $algo;
-
-	/** @var array */
-	private $options;
+	private string $algo;
+	private array $options;
 
 
 	/**

src/Security/Permission.php

@@ -21,14 +21,14 @@ class Permission implements Authorizator
 {
 	use Nette\SmartObject;
 
-	/** @var array  Role storage */
-	private $roles = [];
+	/** Role storage */
+	private array $roles = [];
 
-	/** @var array  Resource storage */
-	private $resources = [];
+	/** Resource storage */
+	private array $resources = [];
 
-	/** @var array  Access Control List rules; whitelist (deny everything to all) by default */
-	private $rules = [
+	/** Access Control List rules; whitelist (deny everything to all) by default */
+	private array $rules = [
 		'allResources' => [
 			'allRoles' => [
 				'allPrivileges' => [
@@ -42,9 +42,7 @@ class Permission implements Authorizator
 		'byResource' => [],
 	];
 
-	/** @var mixed */
-	private $queriedRole;
-
+	private mixed $queriedRole;
 	private $queriedResource;
 
 

src/Security/SimpleAuthenticator.php

@@ -19,14 +19,9 @@ class SimpleAuthenticator implements Authenticator
 {
 	use Nette\SmartObject;
 
-	/** @var array */
-	private $passwords;
-
-	/** @var array */
-	private $roles;
-
-	/** @var array */
-	private $data;
+	private array $passwords;
+	private array $roles;
+	private array $data;
 
 
 	/**

src/Security/User.php

@@ -42,35 +42,25 @@ class User
 	public const LOGOUT_MANUAL = self::LogoutManual;
 	public const LOGOUT_INACTIVITY = self::LogoutInactivity;
 
-	/** @var string  default role for unauthenticated user */
-	public $guestRole = 'guest';
+	/** default role for unauthenticated user */
+	public string $guestRole = 'guest';
 
-	/** @var string  default role for authenticated user without own identity */
-	public $authenticatedRole = 'authenticated';
+	/** default role for authenticated user without own identity */
+	public string $authenticatedRole = 'authenticated';
 
 	/** @var callable[]  function (User $sender): void; Occurs when the user is successfully logged in */
-	public $onLoggedIn = [];
+	public iterable $onLoggedIn = [];
 
 	/** @var callable[]  function (User $sender): void; Occurs when the user is logged out */
-	public $onLoggedOut = [];
-
-	/** @var UserStorage|IUserStorage  Session storage for current user */
-	private $storage;
-
-	/** @var IAuthenticator|null */
-	private $authenticator;
-
-	/** @var Authorizator|null */
-	private $authorizator;
-
-	/** @var IIdentity|null */
-	private $identity;
-
-	/** @var bool|null */
-	private $authenticated;
-
-	/** @var int|null */
-	private $logoutReason;
+	public iterable $onLoggedOut = [];
+
+	/** Session storage for current user */
+	private UserStorage|IUserStorage $storage;
+	private ?IAuthenticator $authenticator;
+	private ?Authorizator $authorizator;
+	private ?IIdentity $identity = null;
+	private ?bool $authenticated = null;
+	private ?int $logoutReason = null;
 
 
 	public function __construct(