Skip to content

Commit 106855c

Browse files
authored
Restricted supported versions to lib-asserts 2, php 8 and codeception 5 (#13)
* Restricted supported versions to lib-asserts 2, php 8 and codeception 5 * Adaptations for codeception 5 * Removed unneeded check
1 parent 0af56a7 commit 106855c

File tree

6 files changed

+9
-22
lines changed

6 files changed

+9
-22
lines changed

.scrutinizer.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@ build:
1414
- php-scrutinizer-run
1515
- ./vendor/bin/codecept run
1616
nodes:
17-
php72:
18-
environment:
19-
php:
20-
version: 7.2
21-
php73:
22-
environment:
23-
php:
24-
version: 7.3
25-
php74:
26-
environment:
27-
php:
28-
version: 7.4
2917
php80:
3018
environment:
3119
php:

codeception.secure.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
actor: Tester
22
paths:
33
tests: tests
4-
log: tests/_output
4+
output: tests/_output
55
data: tests/_data
66
support: tests/_support
77
envs: tests/_envs
@@ -15,7 +15,7 @@ extensions:
1515
config:
1616
\Codeception\Extension\Phiremock:
1717
listen: 0.0.0.0:18080
18-
start_delay: 1
18+
wait_until_ready: true
1919
debug: true
2020
extra_instances:
2121
-

codeception.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
actor: Tester
22
paths:
33
tests: tests
4-
log: tests/_output
54
output: tests/_output
65
data: tests/_data
76
support: tests/_support
@@ -16,5 +15,5 @@ extensions:
1615
config:
1716
\Codeception\Extension\Phiremock:
1817
listen: 0.0.0.0:18080
19-
start_delay: 1
18+
wait_until_ready: true
2019
debug: true

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
"description" : "Codeception module for PhireMock. Allows to stub remote services for HTTP requests.",
3434
"license" : "GPL-3.0-or-later",
3535
"require" : {
36-
"php" : "^7.2|^8.0",
36+
"php" : "^8.0",
3737
"mcustiel/phiremock-client": "^1.0",
38-
"codeception/codeception" : ">=2.2 <6.0",
38+
"codeception/codeception" : "^5.0",
3939
"codeception/lib-asserts": "^1.1|^2.0"
4040
},
4141
"require-dev" : {
42-
"mcustiel/phiremock-codeception-extension": "^2.0",
42+
"mcustiel/phiremock-codeception-extension": "^3.0",
4343
"mcustiel/phiremock-server": "^1.0",
4444
"guzzlehttp/guzzle" : "^7.0",
45-
"codeception/module-asserts": "^1.1|^2.0"
45+
"codeception/module-asserts": "^3.0"
4646
},
4747
"prefer-stable": true
4848
}

src/Util/ExpectationAnnotationParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function getExpectations(TestInterface $test): array
4545
return [];
4646
}
4747
$expectations = Annotation::forMethod(
48-
method_exists($test, 'getTestClass') ? $test->getTestClass() : $test->getTestInstance(),
48+
$test->getTestInstance(),
4949
$test->getTestMethod()
5050
)->fetchAll('expectation');
5151

tests/acceptance.suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Perform tests in browser using the WebDriver or PhpBrowser.
55
# If you need both WebDriver and PHPBrowser tests - create a separate suite.
66

7-
class_name: AcceptanceTester
7+
actor: AcceptanceTester
88
modules:
99
enabled:
1010
- \Helper\Acceptance

0 commit comments

Comments
 (0)