SimpleIdentity & Identity are not aliases due to an unserialization problem

Author: dg

src/Security/Identity.php

@@ -0,0 +1,137 @@
+<?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;
+
+use Nette;
+
+
+/**
+ * @deprecated use Nette\Security\SimpleIdentity
+ *
+ * @property   mixed $id
+ * @property   array $roles
+ * @property   array $data
+ */
+class Identity implements IIdentity
+{
+	use Nette\SmartObject {
+		__get as private parentGet;
+		__set as private parentSet;
+		__isset as private parentIsSet;
+	}
+
+	/** @var mixed */
+	private $id;
+
+	/** @var array */
+	private $roles;
+
+	/** @var array */
+	private $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.
+	 * @param  string|int  $id
+	 * @return static
+	 */
+	public function setId($id)
+	{
+		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;
+	}
+
+
+	/**
+	 * Returns the ID of user.
+	 * @return mixed
+	 */
+	public function getId()
+	{
+		return $this->id;
+	}
+
+
+	/**
+	 * Sets a list of roles that the user is a member of.
+	 * @return static
+	 */
+	public function setRoles(array $roles)
+	{
+		$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.
+	 * @return mixed
+	 */
+	public function &__get(string $key)
+	{
+		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

@@ -19,7 +19,7 @@
  * @property   array $roles
  * @property   array $data
  */
-class SimpleIdentity implements IIdentity
+class SimpleIdentity implements IIdentity, \Serializable
 {
 	use Nette\SmartObject {
 		__get as private parentGet;
@@ -57,14 +57,14 @@ public function setId($id)
 		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;
+		$this->id = $id;
 		return $this;
 	}
 
 
 	/**
 	 * Returns the ID of user.
-	 * @return mixed
+	 * @return string|int
 	 */
 	public function getId()
 	{
@@ -134,4 +134,24 @@ public function __isset(string $key): bool
 	{
 		return isset($this->data[$key]) || $this->parentIsSet($key);
 	}
+
+
+	public function serialize(): string
+	{
+		return serialize([
+			'id' => $this->id,
+			'roles' => $this->roles,
+			'data' => $this->data,
+		]);
+	}
+
+
+	public function unserialize(string $serialized): void
+	{
+		[
+			'id' => $this->id,
+			'roles' => $this->roles,
+			'data' => $this->data,
+		] = unserialize($serialized);
+	}
 }

src/compatibility.php

@@ -34,16 +34,10 @@ interface IRole
 	interface IUserStorage
 	{
 	}
-
-	/** @deprecated use Nette\Security\SimpleIdentity */
-	class Identity extends SimpleIdentity
-	{
-	}
 } elseif (!interface_exists(IAuthenticator::class)) {
 	class_alias(Authenticator::class, IAuthenticator::class);
 	class_alias(Authorizator::class, IAuthorizator::class);
 	class_alias(Resource::class, IResource::class);
 	class_alias(Role::class, IRole::class);
 	class_alias(UserStorage::class, IUserStorage::class);
-	class_alias(SimpleIdentity::class, Identity::class);
 }