Skip to content

Commit 5a23a36

Browse files
committed
Update package.json and index.php for correct issue links and environment settings; fix CSS variable syntax in site.css; improve assertions in IdentityTest for clarity and consistency.
1 parent 3c62ab9 commit 5a23a36

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"license": "BSD-3-Clause",
1919
"bugs": {
20-
"url": "https://github.com/yiisoft/yii2/issues"
20+
"url": "https://github.com/yii2-extensions/app-basic/issues"
2121
},
22-
"homepage": "https://github.com/yiisoft/yii2"
22+
"homepage": "https://github.com/yii2-extensions/app-basic"
2323
}

public/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use yii\web\Application;
66

77
defined('YII_DEBUG') || define('YII_DEBUG', false);
8-
defined('YII_ENV') || define('YII_ENV', 'dev');
8+
defined('YII_ENV') || define('YII_ENV', 'prod');
99

1010
if (getenv('YII_C3')) {
1111
$c3 = dirname(__DIR__) . '/c3.php';

src/framework/resource/css/site.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ html, body {
4343
}
4444

4545
[data-bs-theme=dark] #contactform-verifycode-image {
46-
background-color: var(---bs-secondary-bg);
46+
background-color: var(--bs-secondary-bg);
4747
border: 1px solid rgba(255, 255, 255, 0.1);
4848
box-shadow: 0 1px 3px rgba(0,0,0,0.3);
4949
filter: invert(1) hue-rotate(180deg);

tests/Unit/IdentityTest.php

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,44 +33,45 @@ public function testFindByAccessTokenReturnsIdentityForValidToken(): void
3333
{
3434
$user = Identity::findIdentityByAccessToken('100-token');
3535

36-
assert($user instanceof Identity, 'Expected an instance of \'Identity\' for access token \'100-token\'.');
37-
38-
self::assertSame('100', $user->getId(), 'User ID for access token \'100-token\' should be \'100\'.');
39-
self::assertSame('admin', $user->username, 'Username property should be \'admin\'.');
36+
self::assertInstanceOf(Identity::class, $user, "Expected an instance of 'Identity' for username 'admin'.");
37+
self::assertSame('100', $user->getId(), "User ID for access token '100-token' should be '100'.");
38+
self::assertSame('admin', $user->username, "Username property should be 'admin'.");
4039
}
4140

4241
public function testFindByAccessTokenReturnsNullForInvalidToken(): void
4342
{
4443
self::assertNull(
4544
Identity::findIdentityByAccessToken('invalid-token'),
46-
'Expected \'null\' when finding a user by an invalid access token.',
45+
"Expected 'null' when finding a user by an invalid access token.",
4746
);
4847
}
4948

5049
public function testFindByUsernameReturnsIdentity(): void
5150
{
5251
$user = Identity::findByUsername('admin');
5352

54-
assert($user instanceof Identity, 'Expected an instance of \'Identity\' for username \'admin\'.');
55-
56-
self::assertSame('100', $user->getId(), 'User ID for \'admin\' should be \'100\'.');
57-
self::assertSame('admin', $user->username, 'Username property should be \'admin\'.');
53+
self::assertInstanceOf(Identity::class, $user, "Expected an instance of 'Identity' for username 'admin'.");
54+
self::assertSame('100', $user->getId(), "User ID for 'admin' should be '100'.");
55+
self::assertSame('admin', $user->username, "Username property should be 'admin'.");
5856
}
5957

6058
public function testFindByUsernameReturnsNullForNonexistentUser(): void
6159
{
6260
self::assertNull(
6361
Identity::findByUsername('nonexistent'),
64-
'Expected \'null\' when finding a user by a `nonexistent` username.',
62+
"Expected 'null' when finding a user by a 'nonexistent' username.",
6563
);
6664
}
6765

6866
public function testValidateAuthKeyReturnsTrueForCorrectAuthKey(): void
6967
{
7068
$user = Identity::findByUsername('admin');
7169

72-
assert($user instanceof Identity, 'Expected an instance of \'Identity\' for username \'admin\'.');
73-
70+
self::assertInstanceOf(
71+
Identity::class,
72+
$user,
73+
"Expected an instance of 'Identity' for username 'admin'.",
74+
);
7475
self::assertTrue(
7576
$user->validateAuthKey('test100key'),
7677
'Expected auth key validation to return `true` for correct auth key.',
@@ -81,8 +82,11 @@ public function testValidatePasswordReturnsTrueForCorrectPassword(): void
8182
{
8283
$user = Identity::findByUsername('admin');
8384

84-
assert($user instanceof Identity, 'Expected an instance of \'Identity\' for username \'admin\'.');
85-
85+
self::assertInstanceOf(
86+
Identity::class,
87+
$user,
88+
"Expected an instance of 'Identity' for username 'admin'.",
89+
);
8690
self::assertTrue(
8791
$user->validatePassword('admin'),
8892
'Expected password validation to return `true` for correct password.',

0 commit comments

Comments
 (0)