Identity -> SimpleIdentity

Identity class must exist as an alias in order to read it from session

Author: dg

src/Security/Identity.php

@@ -7,10 +7,119 @@
 
 namespace Nette\Security;
 
+use function in_array, is_float;
+
 
 /**
  * Default implementation of IIdentity.
+ * @property   string|int $id
+ * @property   list<string> $roles
+ * @property   array<string,mixed> $data
  */
-class SimpleIdentity extends Identity
+class SimpleIdentity implements IIdentity
 {
+	private string|int $id;
+
+	/** @var list<string> */
+	private array $roles;
+
+	/** @var array<string, mixed> */
+	private array $data;
+
+
+	/**
+	 * @param  string|list<string>|null  $roles
+	 * @param  ?iterable<string, mixed>  $data
+	 */
+	public function __construct(string|int $id, string|array|null $roles = null, ?iterable $data = null)
+	{
+		$this->setId($id);
+		$this->setRoles((array) $roles);
+		$this->data = iterator_to_array($data ?? []);
+	}
+
+
+	/**
+	 * Sets the ID of user.
+	 */
+	public function setId(string|int $id): static
+	{
+		$this->id = is_numeric($id) && !is_float($tmp = $id * 1) ? $tmp : $id;
+		return $this;
+	}
+
+
+	/**
+	 * Returns the ID of user.
+	 */
+	public function getId(): string|int
+	{
+		return $this->id;
+	}
+
+
+	/**
+	 * Sets a list of roles that the user is a member of.
+	 * @param  list<string>  $roles
+	 */
+	public function setRoles(array $roles): static
+	{
+		$this->roles = $roles;
+		return $this;
+	}
+
+
+	/**
+	 * Returns a list of roles that the user is a member of.
+	 * @return list<string>
+	 */
+	public function getRoles(): array
+	{
+		return $this->roles;
+	}
+
+
+	/**
+	 * Returns user data.
+	 * @return array<string, mixed>
+	 */
+	public function getData(): array
+	{
+		return $this->data;
+	}
+
+
+	/**
+	 * Sets user data value.
+	 */
+	public function __set(string $key, mixed $value): void
+	{
+		match ($key) {
+			'id' => $this->setId($value),
+			'roles' => $this->setRoles($value),
+			'data' => $this->data = $value,
+			default => $this->data[$key] = $value,
+		};
+	}
+
+
+	/**
+	 * Returns user data value.
+	 */
+	public function &__get(string $key): mixed
+	{
+		if (in_array($key, ['id', 'roles', 'data'], strict: true)) {
+			$res = $this->{'get' . ucfirst($key)}();
+			return $res;
+
+		} else {
+			return $this->data[$key];
+		}
+	}
+
+
+	public function __isset(string $key): bool
+	{
+		return isset($this->data[$key]) || in_array($key, ['id', 'roles', 'data'], strict: true);
+	}
 }

src/Security/SimpleIdentity.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Nette\Security;
+
+if (false) {
+	/** @deprecated use Nette\Security\Authorizator */
+	interface IAuthorizator extends Authorizator
+	{
+	}
+} elseif (!interface_exists(IAuthorizator::class)) {
+	class_alias(Authorizator::class, IAuthorizator::class);
+}
+
+if (false) {
+	/** @deprecated use Nette\Security\Resource */
+	interface IResource extends Resource
+	{
+	}
+} elseif (!interface_exists(IResource::class)) {
+	class_alias(Resource::class, IResource::class);
+}
+
+if (false) {
+	/** @deprecated use Nette\Security\Role */
+	interface IRole extends Role
+	{
+	}
+} elseif (!interface_exists(IRole::class)) {
+	class_alias(Role::class, IRole::class);
+}

src/compatibility-intf.php

@@ -8,28 +8,10 @@
 namespace Nette\Security;
 
 if (false) {
-	/** @deprecated use Nette\Security\Authorizator */
-	interface IAuthorizator extends Authorizator
+	/** @deprecated use Nette\Security\SimpleIdentity */
+	class Identity extends SimpleIdentity
 	{
 	}
-} elseif (!interface_exists(IAuthorizator::class)) {
-	class_alias(Authorizator::class, IAuthorizator::class);
-}
-
-if (false) {
-	/** @deprecated use Nette\Security\Resource */
-	interface IResource extends Resource
-	{
-	}
-} elseif (!interface_exists(IResource::class)) {
-	class_alias(Resource::class, IResource::class);
-}
-
-if (false) {
-	/** @deprecated use Nette\Security\Role */
-	interface IRole extends Role
-	{
-	}
-} elseif (!interface_exists(IRole::class)) {
-	class_alias(Role::class, IRole::class);
+} elseif (!class_exists(Identity::class)) {
+	class_alias(SimpleIdentity::class, Identity::class);
 }