Skip to content

Commit

Permalink
Restricted supported versions to lib-asserts 2, php 8 and codeception…
Browse files Browse the repository at this point in the history
… 5 (#13)

* Restricted supported versions to lib-asserts 2, php 8 and codeception 5

* Adaptations for codeception 5

* Removed unneeded check
  • Loading branch information
mcustiel authored Jul 29, 2022
1 parent 0af56a7 commit 106855c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 22 deletions.
12 changes: 0 additions & 12 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@ build:
- php-scrutinizer-run
- ./vendor/bin/codecept run
nodes:
php72:
environment:
php:
version: 7.2
php73:
environment:
php:
version: 7.3
php74:
environment:
php:
version: 7.4
php80:
environment:
php:
Expand Down
4 changes: 2 additions & 2 deletions codeception.secure.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
actor: Tester
paths:
tests: tests
log: tests/_output
output: tests/_output
data: tests/_data
support: tests/_support
envs: tests/_envs
Expand All @@ -15,7 +15,7 @@ extensions:
config:
\Codeception\Extension\Phiremock:
listen: 0.0.0.0:18080
start_delay: 1
wait_until_ready: true
debug: true
extra_instances:
-
Expand Down
3 changes: 1 addition & 2 deletions codeception.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
actor: Tester
paths:
tests: tests
log: tests/_output
output: tests/_output
data: tests/_data
support: tests/_support
Expand All @@ -16,5 +15,5 @@ extensions:
config:
\Codeception\Extension\Phiremock:
listen: 0.0.0.0:18080
start_delay: 1
wait_until_ready: true
debug: true
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
"description" : "Codeception module for PhireMock. Allows to stub remote services for HTTP requests.",
"license" : "GPL-3.0-or-later",
"require" : {
"php" : "^7.2|^8.0",
"php" : "^8.0",
"mcustiel/phiremock-client": "^1.0",
"codeception/codeception" : ">=2.2 <6.0",
"codeception/codeception" : "^5.0",
"codeception/lib-asserts": "^1.1|^2.0"
},
"require-dev" : {
"mcustiel/phiremock-codeception-extension": "^2.0",
"mcustiel/phiremock-codeception-extension": "^3.0",
"mcustiel/phiremock-server": "^1.0",
"guzzlehttp/guzzle" : "^7.0",
"codeception/module-asserts": "^1.1|^2.0"
"codeception/module-asserts": "^3.0"
},
"prefer-stable": true
}
2 changes: 1 addition & 1 deletion src/Util/ExpectationAnnotationParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function getExpectations(TestInterface $test): array
return [];
}
$expectations = Annotation::forMethod(
method_exists($test, 'getTestClass') ? $test->getTestClass() : $test->getTestInstance(),
$test->getTestInstance(),
$test->getTestMethod()
)->fetchAll('expectation');

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance.suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Perform tests in browser using the WebDriver or PhpBrowser.
# If you need both WebDriver and PHPBrowser tests - create a separate suite.

class_name: AcceptanceTester
actor: AcceptanceTester
modules:
enabled:
- \Helper\Acceptance
Expand Down

0 comments on commit 106855c

Please sign in to comment.