Skip to content

Commit 32ed6e9

Browse files
emteknetnzemteknetnz
committed
API phpunit9 support
1 parent 3dd7f46 commit 32ed6e9

File tree

5 files changed

+76
-73
lines changed

5 files changed

+76
-73
lines changed

‎composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
],
99
"license": "BSD-3-Clause",
1010
"require": {
11-
"silverstripe/framework": "^4.0",
11+
"php": "^7.3 || ^8.0",
12+
"silverstripe/framework": "^4.10",
1213
"monolog/monolog": "~1.11",
1314
"psr/log": "~1.0",
1415
"tractorcow/silverstripe-proxy-db": "~0.1"
1516
},
1617
"require-dev": {
17-
"sminnee/phpunit": "^5.7",
18+
"phpunit/phpunit": "^9.5",
1819
"squizlabs/php_codesniffer": "^3.0",
1920
"silverstripe/versioned": "^1.0"
2021
},

‎phpunit.xml.dist

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
2-
<testsuite name="Default">
3-
<directory>tests/</directory>
4-
</testsuite>
2+
<testsuites>
3+
<testsuite name="Default">
4+
<directory>tests/</directory>
5+
</testsuite>
6+
</testsuites>
57
<filter>
68
<whitelist addUncoveredFilesFromWhitelist="true">
79
<directory suffix=".php">code/</directory>

‎tests/AuditHookMFATest.php

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace SilverStripe\Auditor\Tests;
44

5-
use PHPUnit_Framework_MockObject_MockObject;
5+
use PHPUnit\Framework\MockObject\MockObject;
66
use SilverStripe\Auditor\Tests\AuditHookTest\Logger;
77
use SilverStripe\Control\HTTPRequest;
88
use SilverStripe\Control\Session;
@@ -33,11 +33,11 @@ class AuditHookMFATest extends SapphireTest
3333
protected $member;
3434

3535
/**
36-
* @var MethodInterface|PHPUnit_Framework_MockObject_MockObject
36+
* @var MethodInterface|MockObject
3737
*/
3838
protected $method;
3939

40-
protected function setUp()
40+
protected function setUp(): void
4141
{
4242
parent::setUp();
4343

@@ -65,19 +65,19 @@ public function testOnRegisterMethod()
6565
$this->handler->extend('onRegisterMethod', $this->member, $this->method);
6666

6767
$message = $this->writer->getLastMessage();
68-
$this->assertContains('[email protected]', $message);
69-
$this->assertContains('registered MFA method', $message);
70-
$this->assertContains('MethodInterface', $message, 'Method class name is in context');
68+
$this->assertStringContainsString('[email protected]', $message);
69+
$this->assertStringContainsString('registered MFA method', $message);
70+
$this->assertStringContainsString('MethodInterface', $message, 'Method class name is in context');
7171
}
7272

7373
public function testOnRegisterMethodFailure()
7474
{
7575
$this->handler->extend('onRegisterMethodFailure', $this->member, $this->method);
7676

7777
$message = $this->writer->getLastMessage();
78-
$this->assertContains('[email protected]', $message);
79-
$this->assertContains('failed registering new MFA method', $message);
80-
$this->assertContains('MethodInterface', $message, 'Method class name is in context');
78+
$this->assertStringContainsString('[email protected]', $message);
79+
$this->assertStringContainsString('failed registering new MFA method', $message);
80+
$this->assertStringContainsString('MethodInterface', $message, 'Method class name is in context');
8181
}
8282

8383
public function testOnMethodVerificationFailure()
@@ -86,10 +86,10 @@ public function testOnMethodVerificationFailure()
8686
$this->handler->extend('onMethodVerificationFailure', $this->member, $this->method);
8787

8888
$message = $this->writer->getLastMessage();
89-
$this->assertContains('[email protected]', $message);
90-
$this->assertContains('failed to verify using MFA method', $message);
91-
$this->assertContains('MethodInterface', $message, 'Method class name is in context');
92-
$this->assertNotContains('attempt_limit', $message);
89+
$this->assertStringContainsString('[email protected]', $message);
90+
$this->assertStringContainsString('failed to verify using MFA method', $message);
91+
$this->assertStringContainsString('MethodInterface', $message, 'Method class name is in context');
92+
$this->assertStringNotContainsString('attempt_limit', $message);
9393
}
9494

9595
public function testOnMethodVerificationFailureWithLockoutConfiguration()
@@ -101,30 +101,30 @@ public function testOnMethodVerificationFailureWithLockoutConfiguration()
101101
$this->handler->extend('onMethodVerificationFailure', $this->member, $this->method);
102102

103103
$message = $this->writer->getLastMessage();
104-
$this->assertContains('[email protected]', $message);
105-
$this->assertContains('failed to verify using MFA method', $message);
106-
$this->assertContains('MethodInterface', $message, 'Method class name is in context');
104+
$this->assertStringContainsString('[email protected]', $message);
105+
$this->assertStringContainsString('failed to verify using MFA method', $message);
106+
$this->assertStringContainsString('MethodInterface', $message, 'Method class name is in context');
107107
// NB: json format is defined by AuditHookTest\Logger::log()
108-
$this->assertContains('"attempts":3', $message);
109-
$this->assertContains('"attempt_limit":5', $message);
108+
$this->assertStringContainsString('"attempts":3', $message);
109+
$this->assertStringContainsString('"attempt_limit":5', $message);
110110
}
111111

112112
public function testOnSkipRegistration()
113113
{
114114
$this->handler->extend('onSkipRegistration', $this->member, $this->method);
115115

116116
$message = $this->writer->getLastMessage();
117-
$this->assertContains('[email protected]', $message);
118-
$this->assertContains('skipped MFA registration', $message);
117+
$this->assertStringContainsString('[email protected]', $message);
118+
$this->assertStringContainsString('skipped MFA registration', $message);
119119
}
120120

121121
public function testOnMethodVerificationSuccess()
122122
{
123123
$this->handler->extend('onMethodVerificationSuccess', $this->member, $this->method);
124124

125125
$message = $this->writer->getLastMessage();
126-
$this->assertContains('[email protected]', $message);
127-
$this->assertContains('successfully verified using MFA method', $message);
128-
$this->assertContains('MethodInterface', $message, 'Method class name is in context');
126+
$this->assertStringContainsString('[email protected]', $message);
127+
$this->assertStringContainsString('successfully verified using MFA method', $message);
128+
$this->assertStringContainsString('MethodInterface', $message, 'Method class name is in context');
129129
}
130130
}

‎tests/AuditHookSessionManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AuditHookSessionManagerTest extends SapphireTest
2222
*/
2323
protected $writer = null;
2424

25-
protected function setUp()
25+
protected function setUp(): void
2626
{
2727
parent::setUp();
2828
if (!class_exists(LoginSessionController::class)) {

‎tests/AuditHookTest.php

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class AuditHookTest extends FunctionalTest
2020
*/
2121
protected $writer = null;
2222

23-
protected function setUp()
23+
protected function setUp(): void
2424
{
2525
parent::setUp();
2626

@@ -36,8 +36,8 @@ public function testLoggingIn()
3636
$this->logInWithPermission('ADMIN');
3737

3838
$message = $this->writer->getLastMessage();
39-
$this->assertContains('[email protected]', $message);
40-
$this->assertContains('successfully logged in', $message);
39+
$this->assertStringContainsString('[email protected]', $message);
40+
$this->assertStringContainsString('successfully logged in', $message);
4141
}
4242

4343
public function testAutoLoggingIn()
@@ -49,8 +49,8 @@ public function testAutoLoggingIn()
4949
$member->extend('memberAutoLoggedIn');
5050

5151
$message = $this->writer->getLastMessage();
52-
$this->assertContains('[email protected]', $message);
53-
$this->assertContains('successfully restored autologin', $message);
52+
$this->assertStringContainsString('[email protected]', $message);
53+
$this->assertStringContainsString('successfully restored autologin', $message);
5454
}
5555

5656
public function testLoggingOut()
@@ -61,8 +61,8 @@ public function testLoggingOut()
6161
$this->logOut();
6262

6363
$message = $this->writer->getLastMessage();
64-
$this->assertContains('[email protected]', $message);
65-
$this->assertContains('successfully logged out', $message);
64+
$this->assertStringContainsString('[email protected]', $message);
65+
$this->assertStringContainsString('successfully logged out', $message);
6666
}
6767

6868
public function testLoggingWriteDoesNotOccurWhenNotLoggedIn()
@@ -84,9 +84,9 @@ public function testLoggingWriteWhenLoggedIn()
8484
$group->write();
8585

8686
$message = $this->writer->getLastMessage();
87-
$this->assertContains('[email protected]', $message);
88-
$this->assertContains('modified', $message);
89-
$this->assertContains(Group::class, $message);
87+
$this->assertStringContainsString('[email protected]', $message);
88+
$this->assertStringContainsString('modified', $message);
89+
$this->assertStringContainsString(Group::class, $message);
9090
}
9191

9292
public function testAddMemberToGroupUsingGroupMembersRelation()
@@ -102,9 +102,9 @@ public function testAddMemberToGroupUsingGroupMembersRelation()
102102
$group->Members()->add($member);
103103

104104
$message = $this->writer->getLastMessage();
105-
$this->assertContains('[email protected]', $message);
106-
$this->assertContains('added Member "joe1"', $message);
107-
$this->assertContains('to Group "My group"', $message);
105+
$this->assertStringContainsString('[email protected]', $message);
106+
$this->assertStringContainsString('added Member "joe1"', $message);
107+
$this->assertStringContainsString('to Group "My group"', $message);
108108
}
109109

110110
public function testAddMemberToGroupUsingMemberGroupsRelation()
@@ -120,9 +120,9 @@ public function testAddMemberToGroupUsingMemberGroupsRelation()
120120
$member->Groups()->add($group);
121121

122122
$message = $this->writer->getLastMessage();
123-
$this->assertContains('[email protected]', $message);
124-
$this->assertContains('added Member "joe2"', $message);
125-
$this->assertContains('to Group "My group"', $message);
123+
$this->assertStringContainsString('[email protected]', $message);
124+
$this->assertStringContainsString('added Member "joe2"', $message);
125+
$this->assertStringContainsString('to Group "My group"', $message);
126126
}
127127

128128
public function testRemoveMemberFromGroupUsingGroupMembersRelation()
@@ -139,9 +139,9 @@ public function testRemoveMemberFromGroupUsingGroupMembersRelation()
139139
$group->Members()->remove($member);
140140

141141
$message = $this->writer->getLastMessage();
142-
$this->assertContains('[email protected]', $message);
143-
$this->assertContains('removed Member "joe3"', $message);
144-
$this->assertContains('from Group "My group"', $message);
142+
$this->assertStringContainsString('[email protected]', $message);
143+
$this->assertStringContainsString('removed Member "joe3"', $message);
144+
$this->assertStringContainsString('from Group "My group"', $message);
145145
}
146146

147147
public function testRemoveMemberFromGroupUsingMemberGroupsRelation()
@@ -158,9 +158,9 @@ public function testRemoveMemberFromGroupUsingMemberGroupsRelation()
158158
$member->Groups()->remove($group);
159159

160160
$message = $this->writer->getLastMessage();
161-
$this->assertContains('[email protected]', $message);
162-
$this->assertContains('removed Member "joe4"', $message);
163-
$this->assertContains('from Group "My group"', $message);
161+
$this->assertStringContainsString('[email protected]', $message);
162+
$this->assertStringContainsString('removed Member "joe4"', $message);
163+
$this->assertStringContainsString('from Group "My group"', $message);
164164
}
165165

166166
public function testAddRoleCodeToRole()
@@ -175,8 +175,8 @@ public function testAddRoleCodeToRole()
175175
$permissionRole->write();
176176

177177
$message = $this->writer->getLastMessage();
178-
$this->assertContains('Effective code', $message);
179-
$this->assertContains('grand_ruler', $message);
178+
$this->assertStringContainsString('Effective code', $message);
179+
$this->assertStringContainsString('grand_ruler', $message);
180180
}
181181

182182
public function testAddViewerGroupToPage()
@@ -198,8 +198,8 @@ public function testAddViewerGroupToPage()
198198
$page->publishSingle();
199199

200200
$message = $this->writer->getLastMessage();
201-
$this->assertContains('Effective ViewerGroups', $message);
202-
$this->assertContains('OnlyTheseUsers', $message);
201+
$this->assertStringContainsString('Effective ViewerGroups', $message);
202+
$this->assertStringContainsString('OnlyTheseUsers', $message);
203203
}
204204

205205
public function testPublishPage()
@@ -217,9 +217,9 @@ public function testPublishPage()
217217
$page->publishSingle();
218218

219219
$message = $this->writer->getLastMessage();
220-
$this->assertContains('[email protected]', $message);
221-
$this->assertContains('published Page', $message);
222-
$this->assertContains('My page', $message);
220+
$this->assertStringContainsString('[email protected]', $message);
221+
$this->assertStringContainsString('published Page', $message);
222+
$this->assertStringContainsString('My page', $message);
223223
}
224224

225225
public function testUnpublishPage()
@@ -238,9 +238,9 @@ public function testUnpublishPage()
238238
$page->doUnpublish();
239239

240240
$message = $this->writer->getLastMessage();
241-
$this->assertContains('[email protected]', $message);
242-
$this->assertContains('unpublished Page', $message);
243-
$this->assertContains('My page', $message);
241+
$this->assertStringContainsString('[email protected]', $message);
242+
$this->assertStringContainsString('unpublished Page', $message);
243+
$this->assertStringContainsString('My page', $message);
244244
}
245245

246246
public function testDuplicatePage()
@@ -258,9 +258,9 @@ public function testDuplicatePage()
258258
$page->duplicate();
259259

260260
$message = $this->writer->getLastMessage();
261-
$this->assertContains('[email protected]', $message);
262-
$this->assertContains('duplicated Page', $message);
263-
$this->assertContains('My page', $message);
261+
$this->assertStringContainsString('[email protected]', $message);
262+
$this->assertStringContainsString('duplicated Page', $message);
263+
$this->assertStringContainsString('My page', $message);
264264
}
265265

266266
public function testRevertToLive()
@@ -282,9 +282,9 @@ public function testRevertToLive()
282282
$page->doRevertToLive();
283283

284284
$message = $this->writer->getLastMessage();
285-
$this->assertContains('[email protected]', $message);
286-
$this->assertContains('reverted Page', $message);
287-
$this->assertContains('My page', $message);
285+
$this->assertStringContainsString('[email protected]', $message);
286+
$this->assertStringContainsString('reverted Page', $message);
287+
$this->assertStringContainsString('My page', $message);
288288
}
289289

290290
public function testDelete()
@@ -304,9 +304,9 @@ public function testDelete()
304304
$page->delete();
305305

306306
$message = $this->writer->getLastMessage();
307-
$this->assertContains('[email protected]', $message);
308-
$this->assertContains('deleted Page', $message);
309-
$this->assertContains('My page', $message);
307+
$this->assertStringContainsString('[email protected]', $message);
308+
$this->assertStringContainsString('deleted Page', $message);
309+
$this->assertStringContainsString('My page', $message);
310310
}
311311

312312
public function testRestoreToStage()
@@ -329,8 +329,8 @@ public function testRestoreToStage()
329329
$page->delete();
330330

331331
$message = $this->writer->getLastMessage();
332-
$this->assertContains('[email protected]', $message);
333-
$this->assertContains('deleted Page', $message);
334-
$this->assertContains('My page', $message);
332+
$this->assertStringContainsString('[email protected]', $message);
333+
$this->assertStringContainsString('deleted Page', $message);
334+
$this->assertStringContainsString('My page', $message);
335335
}
336336
}

0 commit comments

Comments
 (0)