Skip to content

Commit 8b44313

Browse files
committed
renamed Identity -> SimpleIdentity
1 parent 43ace81 commit 8b44313

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

src/Security/SimpleAuthenticator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function authenticate(array $credentials): IIdentity
5353
foreach ($this->userlist as $name => $pass) {
5454
if (strcasecmp($name, $username) === 0) {
5555
if ((string) $pass === (string) $password) {
56-
return new Identity($name, $this->usersRoles[$name] ?? null, $this->usersData[$name] ?? []);
56+
return new SimpleIdentity($name, $this->usersRoles[$name] ?? null, $this->usersData[$name] ?? []);
5757
} else {
5858
throw new AuthenticationException('Invalid password.', self::INVALID_CREDENTIAL);
5959
}

src/Security/Identity.php renamed to src/Security/SimpleIdentity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* @property array $roles
2020
* @property array $data
2121
*/
22-
class Identity implements IIdentity
22+
class SimpleIdentity implements IIdentity
2323
{
2424
use Nette\SmartObject {
2525
__get as private parentGet;

src/compatibility.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,16 @@ class IRole
3434
class IUserStorage
3535
{
3636
}
37+
38+
/** @deprecated use Nette\Security\SimpleIdentity */
39+
class Identity
40+
{
41+
}
3742
} elseif (!interface_exists(IAuthenticator::class)) {
3843
class_alias(Authenticator::class, IAuthenticator::class);
3944
class_alias(Authorizator::class, IAuthorizator::class);
4045
class_alias(Resource::class, IResource::class);
4146
class_alias(Role::class, IRole::class);
4247
class_alias(UserStorage::class, IUserStorage::class);
48+
class_alias(SimpleIdentity::class, Identity::class);
4349
}
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?php
22

33
/**
4-
* Test: Nette\Security\Identity.
4+
* Test: Nette\Security\SimpleIdentity.
55
*/
66

77
declare(strict_types=1);
88

9-
use Nette\Security\Identity;
9+
use Nette\Security\SimpleIdentity;
1010
use Tester\Assert;
1111

1212

1313
require __DIR__ . '/../bootstrap.php';
1414

1515

1616
test('', function () {
17-
$id = new Identity(12, 'admin', ['name' => 'John']);
17+
$id = new SimpleIdentity(12, 'admin', ['name' => 'John']);
1818

1919
Assert::same(12, $id->getId());
2020
Assert::same(12, $id->id);
@@ -27,10 +27,10 @@ test('', function () {
2727

2828

2929
test('', function () {
30-
$id = new Identity('12');
30+
$id = new SimpleIdentity('12');
3131
Assert::same(12, $id->getId());
3232

3333

34-
$id = new Identity('12345678901234567890');
34+
$id = new SimpleIdentity('12345678901234567890');
3535
Assert::same('12345678901234567890', $id->getId());
3636
});

tests/Security/User.authentication.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
declare(strict_types=1);
88

99
use Nette\Security\Authenticator as IAuthenticator;
10-
use Nette\Security\Identity;
10+
use Nette\Security\SimpleIdentity;
1111
use Tester\Assert;
1212

1313

@@ -31,7 +31,7 @@ class Authenticator implements IAuthenticator
3131
throw new Nette\Security\AuthenticationException('Password not match', self::INVALID_CREDENTIAL);
3232

3333
} else {
34-
return new Identity('John Doe', 'admin');
34+
return new SimpleIdentity('John Doe', 'admin');
3535
}
3636
}
3737
}
@@ -81,16 +81,16 @@ Assert::exception(function () use ($user) {
8181
$user->login('john', 'xxx');
8282
Assert::same(1, $counter->login);
8383
Assert::true($user->isLoggedIn());
84-
Assert::equal(new Identity('John Doe', 'admin'), $user->getIdentity());
84+
Assert::equal(new SimpleIdentity('John Doe', 'admin'), $user->getIdentity());
8585
Assert::same('John Doe', $user->getId());
8686

8787
// login as john#3
8888
$user->logout(true);
8989
Assert::same(1, $counter->logout);
90-
$user->login(new Identity('John Doe', 'admin'));
90+
$user->login(new SimpleIdentity('John Doe', 'admin'));
9191
Assert::same(2, $counter->login);
9292
Assert::true($user->isLoggedIn());
93-
Assert::equal(new Identity('John Doe', 'admin'), $user->getIdentity());
93+
Assert::equal(new SimpleIdentity('John Doe', 'admin'), $user->getIdentity());
9494

9595

9696
// log out
@@ -99,7 +99,7 @@ $user->logout(false);
9999
Assert::same(2, $counter->logout);
100100

101101
Assert::false($user->isLoggedIn());
102-
Assert::equal(new Identity('John Doe', 'admin'), $user->getIdentity());
102+
Assert::equal(new SimpleIdentity('John Doe', 'admin'), $user->getIdentity());
103103

104104

105105
// logging out and clearing identity...

0 commit comments

Comments
 (0)