renamed Identity -> SimpleIdentity

nette · Nov 25, 2020 · d6dc5d1 · d6dc5d1
1 parent 6cadf83
commit d6dc5d1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/src/Security/SimpleAuthenticator.php b/src/Security/SimpleAuthenticator.php
@@ -53,7 +53,7 @@ public function authenticate(array $credentials): IIdentity
 		foreach ($this->userlist as $name => $pass) {
 			if (strcasecmp($name, $username) === 0) {
 				if ((string) $pass === (string) $password) {
-					return new Identity($name, $this->usersRoles[$name] ?? null, $this->usersData[$name] ?? []);
+					return new SimpleIdentity($name, $this->usersRoles[$name] ?? null, $this->usersData[$name] ?? []);
 				} else {
 					throw new AuthenticationException('Invalid password.', self::INVALID_CREDENTIAL);
 				}

diff --git a/src/Security/Identity.php → src/Security/SimpleIdentity.php b/src/Security/Identity.php → src/Security/SimpleIdentity.php
@@ -19,7 +19,7 @@
  * @property   array $roles
  * @property   array $data
  */
-class Identity implements IIdentity
+class SimpleIdentity implements IIdentity
 {
 	use Nette\SmartObject {
 		__get as private parentGet;

diff --git a/src/compatibility.php b/src/compatibility.php
@@ -34,10 +34,16 @@ class IRole
 	class IUserStorage
 	{
 	}
+
+	/** @deprecated use Nette\Security\SimpleIdentity */
+	class Identity
+	{
+	}
 } 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);
 }
diff --git a/tests/Security/Identity.phpt → tests/Security/SimpleIdentity.phpt b/tests/Security/Identity.phpt → tests/Security/SimpleIdentity.phpt
@@ -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());
 });
diff --git a/tests/Security/User.authentication.phpt b/tests/Security/User.authentication.phpt
@@ -7,7 +7,7 @@
 declare(strict_types=1);
 
 use Nette\Security\Authenticator as IAuthenticator;
-use Nette\Security\Identity;
+use Nette\Security\SimpleIdentity;
 use Tester\Assert;
 
 
@@ -31,7 +31,7 @@ class Authenticator implements IAuthenticator
 			throw new Nette\Security\AuthenticationException('Password not match', self::INVALID_CREDENTIAL);
 
 		} else {
-			return new Identity('John Doe', 'admin');
+			return new SimpleIdentity('John Doe', 'admin');
 		}
 	}
 }
@@ -81,16 +81,16 @@ Assert::exception(function () use ($user) {
 $user->login('john', 'xxx');
 Assert::same(1, $counter->login);
 Assert::true($user->isLoggedIn());
-Assert::equal(new Identity('John Doe', 'admin'), $user->getIdentity());
+Assert::equal(new SimpleIdentity('John Doe', 'admin'), $user->getIdentity());
 Assert::same('John Doe', $user->getId());
 
 // login as john#3
 $user->logout(true);
 Assert::same(1, $counter->logout);
-$user->login(new Identity('John Doe', 'admin'));
+$user->login(new SimpleIdentity('John Doe', 'admin'));
 Assert::same(2, $counter->login);
 Assert::true($user->isLoggedIn());
-Assert::equal(new Identity('John Doe', 'admin'), $user->getIdentity());
+Assert::equal(new SimpleIdentity('John Doe', 'admin'), $user->getIdentity());
 
 
 // log out
@@ -99,7 +99,7 @@ $user->logout(false);
 Assert::same(2, $counter->logout);
 
 Assert::false($user->isLoggedIn());
-Assert::equal(new Identity('John Doe', 'admin'), $user->getIdentity());
+Assert::equal(new SimpleIdentity('John Doe', 'admin'), $user->getIdentity());
 
 
 // logging out and clearing identity...