Skip to content

Commit eceb2cd

Browse files
authored
Allow to run on php 8.1 / phpunit 9.5 (#33)
* change: update composer.json to work with php > 7.3 * change: update phpunit to 9.5 * add: phpunit cache file to ignore
1 parent 7af0433 commit eceb2cd

File tree

5 files changed

+57
-44
lines changed

5 files changed

+57
-44
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.idea
22
vendor
33
composer.lock
4+
/.phpunit.result.cache

composer.json

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,39 @@
11
{
2-
"name": "daylerees/scientist",
3-
"description": "A PHP experimentation library inspired by Github's own Scientist.",
4-
"keywords": ["scientist", "testing", "experiment", "framework", "dayle", "test"],
5-
"license": "MIT",
6-
"type": "library",
7-
"authors": [
8-
{
9-
"name": "Dayle Rees",
10-
"email": "me@daylerees.com"
11-
}
12-
],
13-
"require": {
14-
"php": "^7.0"
15-
},
16-
"require-dev": {
17-
"phpunit/phpunit": "^6.0",
18-
"squizlabs/php_codesniffer": "^2.5",
19-
"jakub-onderka/php-parallel-lint": "^0.9.2",
20-
"phing/phing": "^2.13"
21-
},
22-
"autoload": {
23-
"psr-4": {
24-
"Scientist\\": "src"
25-
}
2+
"name": "daylerees/scientist",
3+
"description": "A PHP experimentation library inspired by Github's own Scientist.",
4+
"keywords": [
5+
"scientist",
6+
"testing",
7+
"experiment",
8+
"framework",
9+
"dayle",
10+
"test"
11+
],
12+
"license": "MIT",
13+
"type": "library",
14+
"authors": [
15+
{
16+
"name": "Dayle Rees",
17+
"email": "me@daylerees.com"
2618
}
19+
],
20+
"require": {
21+
"php": ">=7.3"
22+
},
23+
"require-dev": {
24+
"phpunit/phpunit": "^9.5",
25+
"squizlabs/php_codesniffer": "^2.9",
26+
"php-parallel-lint/php-parallel-lint": "^1.3",
27+
"phing/phing": "^2.13"
28+
},
29+
"autoload": {
30+
"psr-4": {
31+
"Scientist\\": "src"
32+
}
33+
},
34+
"autoload-dev": {
35+
"psr-4": {
36+
"Scientist\\Tests\\": "tests"
37+
}
38+
}
2739
}

tests/Chances/StandardChanceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class StandardChanceTest extends \PHPUnit\Framework\TestCase
88
*/
99
private $chance;
1010

11-
public function setUp()
11+
public function setUp(): void
1212
{
1313
$this->chance = new StandardChance();
1414
}

tests/LaboratoryTest.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ public function test_laboratory_can_fetch_report_for_experiment_with_no_journals
3333
$this->assertInstanceOf(Report::class, $r);
3434
$this->assertEquals('foo', $r->getControl()->getValue());
3535
$this->assertEquals('bar', $r->getTrial('trial')->getValue());
36-
$this->assertInternalType('float', $r->getControl()->getStartTime());
37-
$this->assertInternalType('float', $r->getControl()->getEndTime());
38-
$this->assertInternalType('float', $r->getControl()->getTime());
39-
$this->assertInternalType('float', $r->getTrial('trial')->getStartTime());
40-
$this->assertInternalType('float', $r->getTrial('trial')->getEndTime());
41-
$this->assertInternalType('float', $r->getTrial('trial')->getTime());
42-
$this->assertInternalType('integer', $r->getControl()->getStartMemory());
43-
$this->assertInternalType('integer', $r->getControl()->getEndMemory());
44-
$this->assertInternalType('integer', $r->getControl()->getMemory());
45-
$this->assertInternalType('integer', $r->getTrial('trial')->getStartMemory());
46-
$this->assertInternalType('integer', $r->getTrial('trial')->getEndMemory());
47-
$this->assertInternalType('integer', $r->getTrial('trial')->getMemory());
48-
$this->assertInternalType('null', $r->getControl()->getException());
49-
$this->assertInternalType('null', $r->getTrial('trial')->getException());
36+
$this->assertIsFloat($r->getControl()->getStartTime());
37+
$this->assertIsFloat($r->getControl()->getEndTime());
38+
$this->assertIsFloat($r->getControl()->getTime());
39+
$this->assertIsFloat($r->getTrial('trial')->getStartTime());
40+
$this->assertIsFloat($r->getTrial('trial')->getEndTime());
41+
$this->assertIsFloat($r->getTrial('trial')->getTime());
42+
$this->assertIsInt($r->getControl()->getStartMemory());
43+
$this->assertIsInt($r->getControl()->getEndMemory());
44+
$this->assertIsInt($r->getControl()->getMemory());
45+
$this->assertIsInt($r->getTrial('trial')->getStartMemory());
46+
$this->assertIsInt($r->getTrial('trial')->getEndMemory());
47+
$this->assertIsInt($r->getTrial('trial')->getMemory());
48+
$this->assertNull($r->getControl()->getException());
49+
$this->assertNull($r->getTrial('trial')->getException());
5050
$this->assertFalse($r->getTrial('trial')->isMatch());
5151
}
5252

@@ -70,7 +70,7 @@ public function test_that_exceptions_are_swallowed_within_the_trial()
7070
->report();
7171

7272
$this->assertInstanceOf(Report::class, $r);
73-
$this->assertInternalType('null', $r->getControl()->getException());
73+
$this->assertNull($r->getControl()->getException());
7474
$this->assertInstanceOf(Exception::class, $r->getTrial('trial')->getException());
7575
}
7676

tests/MachineTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ public function test_that_machine_can_determine_start_and_end_times_for_callback
9393
$r = $m->execute();
9494
$e = microtime(true) + 60;
9595

96-
$this->assertInternalType('float', $r->getStartTime());
97-
$this->assertInternalType('float', $r->getEndTime());
96+
$this->assertIsFloat($r->getStartTime());
97+
$this->assertIsFloat($r->getEndTime());
9898
$this->assertGreaterThan($s, $r->getStartTime());
9999
$this->assertGreaterThan($s, $r->getEndTime());
100100
$this->assertLessThan($e, $r->getStartTime());
@@ -107,7 +107,7 @@ public function test_that_machine_can_determine_memory_usage_changes()
107107

108108
$r = $m->execute();
109109

110-
$this->assertInternalType('integer', $r->getStartMemory());
111-
$this->assertInternalType('integer', $r->getEndMemory());
110+
$this->assertIsInt($r->getStartMemory());
111+
$this->assertIsInt($r->getEndMemory());
112112
}
113113
}

0 commit comments

Comments
 (0)