removed Nette\SmartObject

Author: dg

src/Bridges/SecurityHttp/CookieStorage.php

@@ -19,8 +19,6 @@
  */
 final class CookieStorage implements Nette\Security\UserStorage
 {
-	use Nette\SmartObject;
-
 	private const MinLength = 13;
 
 	private Http\IRequest $request;

src/Bridges/SecurityHttp/SessionStorage.php

@@ -20,8 +20,6 @@
  */
 final class SessionStorage implements Nette\Security\UserStorage
 {
-	use Nette\SmartObject;
-
 	private string $namespace = '';
 	private Session $sessionHandler;
 	private ?SessionSection $sessionSection = null;

src/Bridges/SecurityTracy/UserPanel.php

@@ -18,8 +18,6 @@
  */
 class UserPanel implements Tracy\IBarPanel
 {
-	use Nette\SmartObject;
-
 	private Nette\Security\User $user;
 
 

src/Security/Identity.php

@@ -9,8 +9,6 @@
 
 namespace Nette\Security;
 
-use Nette;
-
 
 /**
  * @deprecated  use Nette\Security\SimpleIdentity
@@ -20,12 +18,6 @@
  */
 class Identity 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;
@@ -93,8 +85,8 @@ public function getData(): array
 	 */
 	public function __set(string $key, $value): void
 	{
-		if ($this->parentIsSet($key)) {
-			$this->parentSet($key, $value);
+		if (in_array($key, ['id', 'roles', 'data'], strict: true)) {
+			$this->{"set$key"}($value);
 
 		} else {
 			$this->data[$key] = $value;
@@ -107,8 +99,9 @@ public function __set(string $key, $value): void
 	 */
 	public function &__get(string $key): mixed
 	{
-		if ($this->parentIsSet($key)) {
-			return $this->parentGet($key);
+		if (in_array($key, ['id', 'roles', 'data'], strict: true)) {
+			$res = $this->{"get$key"}();
+			return $res;
 
 		} else {
 			return $this->data[$key];
@@ -118,6 +111,6 @@ public function &__get(string $key): mixed
 
 	public function __isset(string $key): bool
 	{
-		return isset($this->data[$key]) || $this->parentIsSet($key);
+		return isset($this->data[$key]) || in_array($key, ['id', 'roles', 'data'], strict: true);
 	}
 }

src/Security/Passwords.php

@@ -17,8 +17,6 @@
  */
 class Passwords
 {
-	use Nette\SmartObject;
-
 	private string $algo;
 	private array $options;
 

src/Security/Permission.php

@@ -19,8 +19,6 @@
  */
 class Permission implements Authorizator
 {
-	use Nette\SmartObject;
-
 	private array $roles = [];
 	private array $resources = [];
 

src/Security/SimpleAuthenticator.php

@@ -9,16 +9,12 @@
 
 namespace Nette\Security;
 
-use Nette;
-
 
 /**
  * Trivial implementation of Authenticator.
  */
 class SimpleAuthenticator implements Authenticator
 {
-	use Nette\SmartObject;
-
 	private array $passwords;
 	private array $roles;
 	private array $data;