Identity -> SimpleIdentity

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

Author: dg

src/Security/Identity.php

@@ -9,10 +9,115 @@
 
 namespace Nette\Security;
 
+use Nette;
+
 
 /**
  * Default implementation of IIdentity.
+ * @property   string|int $id
+ * @property   array $roles
+ * @property   array $data
  */
-class SimpleIdentity extends Identity
+class SimpleIdentity implements IIdentity
 {
+	use Nette\SmartObject {
+		__get as private parentGet;
+		__set as private parentSet;
+		__isset as private parentIsSet;
+	}
+
+	private string|int $id;
+	private array $roles;
+	private array $data;
+
+
+	public function __construct($id, $roles = null, ?iterable $data = null)
+	{
+		$this->setId($id);
+		$this->setRoles((array) $roles);
+		$this->data = $data instanceof \Traversable
+			? iterator_to_array($data)
+			: (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.
+	 */
+	public function setRoles(array $roles): static
+	{
+		$this->roles = $roles;
+		return $this;
+	}
+
+
+	/**
+	 * Returns a list of roles that the user is a member of.
+	 */
+	public function getRoles(): array
+	{
+		return $this->roles;
+	}
+
+
+	/**
+	 * Returns a user data.
+	 */
+	public function getData(): array
+	{
+		return $this->data;
+	}
+
+
+	/**
+	 * Sets user data value.
+	 */
+	public function __set(string $key, $value): void
+	{
+		if ($this->parentIsSet($key)) {
+			$this->parentSet($key, $value);
+
+		} else {
+			$this->data[$key] = $value;
+		}
+	}
+
+
+	/**
+	 * Returns user data value.
+	 */
+	public function &__get(string $key): mixed
+	{
+		if ($this->parentIsSet($key)) {
+			return $this->parentGet($key);
+
+		} else {
+			return $this->data[$key];
+		}
+	}
+
+
+	public function __isset(string $key): bool
+	{
+		return isset($this->data[$key]) || $this->parentIsSet($key);
+	}
 }

src/Security/SimpleIdentity.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+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

@@ -10,28 +10,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);
 }

src/compatibility.php

@@ -1,20 +1,20 @@
 <?php
 
 /**
- * Test: Nette\Security\Identity.
+ * Test: Nette\Security\SimpleIdentity.
  */
 
 declare(strict_types=1);
 
-use Nette\Security\Identity;
+use Nette\Security\SimpleIdentity;
 use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
 
 
 test('', function () {
-	$id = new Identity(12, 'admin', ['name' => 'John']);
+	$id = new SimpleIdentity(12, 'admin', ['name' => 'John']);
 
 	Assert::same(12, $id->getId());
 	Assert::same(12, $id->id);
@@ -27,10 +27,10 @@ test('', function () {
 
 
 test('', function () {
-	$id = new Identity('12');
+	$id = new SimpleIdentity('12');
 	Assert::same(12, $id->getId());
 
 
-	$id = new Identity('12345678901234567890');
+	$id = new SimpleIdentity('12345678901234567890');
 	Assert::same('12345678901234567890', $id->getId());
 });