Skip to content

Commit c1bb3b4

Browse files
committed
prepare to release
1 parent cfe14e8 commit c1bb3b4

File tree

5 files changed

+18
-24
lines changed

5 files changed

+18
-24
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
Changelog
22
=========
3+
Releases for CakePHP 4.3
4+
5+
* 11.0.0
6+
* Switched tests to new cakephp schema
7+
* Update to PHPUnit 9.5
8+
9+
310
Releases for CakePHP 4
411
-------------
512
* 9.2.0

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"source": "https://github.com/CakeDC/users"
2828
},
2929
"minimum-stability": "dev",
30+
"prefer-stable": true,
3031
"require": {
3132
"php": ">=7.2.0",
3233
"cakephp/cakephp": "^4.0",

tests/Fixture/UsersFixture.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function init(): void
4747
'role' => 'admin',
4848
'created' => '2015-06-24 17:33:54',
4949
'modified' => '2015-06-24 17:33:54',
50-
'additional_data' => json_encode([
50+
'additional_data' => [
5151
'u2f_registration' => [
5252
'keyHandle' => 'fake key handle',
5353
'publicKey' => 'afdoaj0-23u423-ad ujsf-as8-0-afsd',
@@ -70,7 +70,7 @@ public function init(): void
7070
'otherUI' => null,
7171
],
7272
],
73-
]),
73+
],
7474
'last_login' => '2015-06-24 17:33:54',
7575
],
7676
[

tests/TestCase/Controller/Traits/Webauthn2faTraitTest.php

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,10 @@ public function testWebauthn2faIsRegister()
104104
$this->_mockSession([
105105
'Webauthn2fa.User' => $user,
106106
]);
107-
$this->Trait->expects($this->at(1))
108-
->method('set')
109-
->with(
110-
$this->equalTo('isRegister'),
111-
$this->equalTo(true)
112-
);
113-
$this->Trait->expects($this->at(2))
107+
$this->Trait
108+
->expects($this->exactly(2))
114109
->method('set')
115-
->with(
116-
$this->equalTo('username'),
117-
$this->equalTo('user-2')
118-
);
110+
->withConsecutive(['isRegister', true], ['username', 'user-2']);
119111
$this->Trait->webauthn2fa();
120112
$this->assertSame(
121113
$user,
@@ -146,18 +138,10 @@ public function testWebauthn2faDontRequireRegister()
146138
$this->_mockSession([
147139
'Webauthn2fa.User' => $user,
148140
]);
149-
$this->Trait->expects($this->at(1))
150-
->method('set')
151-
->with(
152-
$this->equalTo('isRegister'),
153-
$this->equalTo(false)
154-
);
155-
$this->Trait->expects($this->at(2))
141+
$this->Trait
142+
->expects($this->exactly(2))
156143
->method('set')
157-
->with(
158-
$this->equalTo('username'),
159-
$this->equalTo('user-1')
160-
);
144+
->withConsecutive(['isRegister', false], ['username', 'user-1']);
161145
$this->Trait->webauthn2fa();
162146
$this->assertSame(
163147
$user,

tests/TestCase/Webauthn/Repository/UserCredentialSourceRepositoryTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ public function testFindAllForUserEntity()
7474
*/
7575
public function testSaveCredentialSource()
7676
{
77+
\Cake\Database\TypeFactory::map('json', \Cake\Database\Type\JsonType::class);
78+
7779
$publicKeyCredentialId = '12b37486-9299-4331-ac33-85b2d985b6fe';
7880
$userId = '00000000-0000-0000-0000-000000000001';
7981
$credentialData = [

0 commit comments

Comments
 (0)