added PHP 8 typehints

Author: dg

src/Bridges/SecurityHttp/SessionStorage.php

@@ -101,9 +101,8 @@ private function setupExpiration(): void
 
 	/**
 	 * Changes namespace; allows more users to share a session.
-	 * @return static
 	 */
-	public function setNamespace(string $namespace)
+	public function setNamespace(string $namespace): static
 	{
 		if ($this->namespace !== $namespace) {
 			$this->namespace = $namespace;

src/Security/Authorizator.php

@@ -32,11 +32,8 @@ interface Authorizator
 
 	/**
 	 * Performs a role-based authorization.
-	 * @param  string|null  $role
-	 * @param  string|null  $resource
-	 * @param  string|null  $privilege
 	 */
-	function isAllowed($role, $resource, $privilege): bool;
+	function isAllowed(?string $role, ?string $resource, ?string $privilege): bool;
 }
 
 

src/Security/IIdentity.php

@@ -18,9 +18,8 @@ interface IIdentity
 {
 	/**
 	 * Returns the ID of user.
-	 * @return mixed
 	 */
-	function getId();
+	function getId(): string|int;
 
 	/**
 	 * Returns a list of roles that the user is a member of.

src/Security/Identity.php

@@ -43,14 +43,9 @@ public function __construct($id, $roles = null, ?iterable $data = null)
 
 	/**
 	 * Sets the ID of user.
-	 * @param  string|int  $id
-	 * @return static
 	 */
-	public function setId($id)
+	public function setId(string|int $id): static
 	{
-		if (!is_string($id) && !is_int($id)) {
-			throw new Nette\InvalidArgumentException('Identity identifier must be string|int, but type "' . gettype($id) . '" given.');
-		}
 
 		$this->id = is_numeric($id) && !is_float($tmp = $id * 1) ? $tmp : $id;
 		return $this;
@@ -59,19 +54,17 @@ public function setId($id)
 
 	/**
 	 * Returns the ID of user.
-	 * @return mixed
 	 */
-	public function getId()
+	public function getId(): string|int
 	{
 		return $this->id;
 	}
 
 
 	/**
 	 * Sets a list of roles that the user is a member of.
-	 * @return static
 	 */
-	public function setRoles(array $roles)
+	public function setRoles(array $roles): static
 	{
 		$this->roles = $roles;
 		return $this;
@@ -112,9 +105,8 @@ public function __set(string $key, $value): void
 
 	/**
 	 * Returns user data value.
-	 * @return mixed
 	 */
-	public function &__get(string $key)
+	public function &__get(string $key): mixed
 	{
 		if ($this->parentIsSet($key)) {
 			return $this->parentGet($key);

src/Security/Passwords.php

@@ -27,7 +27,7 @@ class Passwords
 	 * Chooses which secure algorithm is used for hashing and how to configure it.
 	 * @see https://php.net/manual/en/password.constants.php
 	 */
-	public function __construct($algo = PASSWORD_DEFAULT, array $options = [])
+	public function __construct(string $algo = PASSWORD_DEFAULT, array $options = [])
 	{
 		$this->algo = $algo;
 		$this->options = $options;

src/Security/Permission.php

@@ -424,7 +424,7 @@ public function deny(
 	 * @param  string|string[]|null  $privileges
 	 * @return static
 	 */
-	public function removeAllow($roles = self::All, $resources = self::All, $privileges = self::All)
+	public function removeAllow($roles = self::All, $resources = self::All, $privileges = self::All): static
 	{
 		$this->setRule(false, self::Allow, $roles, $resources, $privileges);
 		return $this;
@@ -439,7 +439,7 @@ public function removeAllow($roles = self::All, $resources = self::All, $privile
 	 * @param  string|string[]|null  $privileges
 	 * @return static
 	 */
-	public function removeDeny($roles = self::All, $resources = self::All, $privileges = self::All)
+	public function removeDeny($roles = self::All, $resources = self::All, $privileges = self::All): static
 	{
 		$this->setRule(false, self::Deny, $roles, $resources, $privileges);
 		return $this;

src/Security/User.php

@@ -18,7 +18,7 @@
  *
  * @property-read bool $loggedIn
  * @property-read IIdentity $identity
- * @property-read mixed $id
+ * @property-read string|int $id
  * @property-read array $roles
  * @property-read int $logoutReason
  * @property   IAuthenticator $authenticator
@@ -79,10 +79,7 @@ public function __construct(
 	}
 
 
-	/**
-	 * @return UserStorage|IUserStorage
-	 */
-	final public function getStorage()
+	final public function getStorage(): UserStorage|IUserStorage
 	{
 		return $this->storage;
 	}
@@ -96,7 +93,7 @@ final public function getStorage()
 	 * @param  string|IIdentity  $user  name or Identity
 	 * @throws AuthenticationException if authentication was not successful
 	 */
-	public function login($user, ?string $password = null): void
+	public function login(string|IIdentity $user, ?string $password = null): void
 	{
 		$this->logout(true);
 		if ($user instanceof IIdentity) {
@@ -199,9 +196,8 @@ private function getStoredData(): void
 
 	/**
 	 * Returns current user ID, if any.
-	 * @return mixed
 	 */
-	public function getId()
+	public function getId(): string|int|null
 	{
 		$identity = $this->getIdentity();
 		return $identity ? $identity->getId() : null;
@@ -216,9 +212,8 @@ final public function refreshStorage(): void
 
 	/**
 	 * Sets authentication handler.
-	 * @return static
 	 */
-	public function setAuthenticator(IAuthenticator $handler)
+	public function setAuthenticator(IAuthenticator $handler): static
 	{
 		$this->authenticator = $handler;
 		return $this;
@@ -261,15 +256,9 @@ final public function hasAuthenticator(): bool
 
 	/**
 	 * Enables log out after inactivity (like '20 minutes').
-	 * @param  string|null  $expire
-	 * @param  int|bool  $clearIdentity
-	 * @return static
 	 */
-	public function setExpiration($expire, $clearIdentity = null)
+	public function setExpiration(?string $expire, bool|int|null $clearIdentity = null)
 	{
-		if ($expire !== null && !is_string($expire)) {
-			trigger_error("Expiration should be a string like '20 minutes' etc.", E_USER_DEPRECATED);
-		}
 
 		if (func_num_args() > 2) {
 			$clearIdentity = $clearIdentity || func_get_arg(2);
@@ -343,9 +332,8 @@ public function isAllowed($resource = Authorizator::All, $privilege = Authorizat
 
 	/**
 	 * Sets authorization handler.
-	 * @return static
 	 */
-	public function setAuthorizator(Authorizator $handler)
+	public function setAuthorizator(Authorizator $handler): static
 	{
 		$this->authorizator = $handler;
 		return $this;

tests/Security/MockUserStorage.legacy.php

@@ -9,9 +9,10 @@ class MockUserStorage implements Nette\Security\IUserStorage
 	private $identity;
 
 
-	public function setAuthenticated(bool $state)
+	public function setAuthenticated(bool $state): self
 	{
 		$this->auth = $state;
+		return $this;
 	}