Skip to content

Commit 2881b41

Browse files
authored
Merge pull request #9 from qvers/codeception-5-support
Add codeception 5 support
2 parents 4273e66 + 3674393 commit 2881b41

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

composer.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,16 @@
2424
"description" : "Wiremock extension for Codeception",
2525
"license" : "GPL-3.0+",
2626
"require" : {
27-
"php" : ">=5.6",
28-
"codeception/codeception" : "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
29-
"wiremock-php/wiremock-php" : "^2.18"
27+
"php" : ">=8.0",
28+
"codeception/codeception" : "^5.0.0",
29+
"wiremock-php/wiremock-php" : "^2.35.1"
3030
},
3131
"require-dev" : {
32-
"phing/phing" : "^2.12.0",
33-
"squizlabs/php_codesniffer" : "^2.3.4",
34-
"phpmd/phpmd" : "^2.3.2",
35-
"sebastian/phpcpd" : "^2.0.2",
36-
"pdepend/pdepend" : "^2.0.6",
37-
"phploc/phploc" : "^2.1.1",
38-
"phpdocumentor/phpdocumentor" : "^2.8.5"
32+
"phing/phing" : "^2.17.4",
33+
"squizlabs/php_codesniffer" : "^3.7.2",
34+
"phpmd/phpmd" : "^2.13.0",
35+
"pdepend/pdepend" : "^2.13.0",
36+
"codeception/module-phpbrowser": "^3.0",
37+
"codeception/module-asserts": "^3.0"
3938
}
4039
}

src/Extension/WireMock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
namespace Codeception\Extension;
1919

20-
use Codeception\Platform\Extension as CodeceptionExtension;
20+
use Codeception\Extension as CodeceptionExtension;
2121
use WireMock\Client\WireMock as WireMockClient;
2222

2323
/**

src/Extension/WireMockArguments.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class WireMockArguments
6868
*/
6969
public function __construct()
7070
{
71-
$this->defaults['logs-path'] = Config::logDir();
71+
$this->defaults['logs-path'] = Config::outputDir();
7272
}
7373

7474
/**

src/Module/WireMock.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class WireMock extends CodeceptionModule
3030
*/
3131
private $wireMock;
3232

33-
protected $config = [
33+
protected array $config = [
3434
'host' => 'localhost',
3535
'port' => '8080'
3636
];
@@ -39,7 +39,7 @@ class WireMock extends CodeceptionModule
3939
* {@inheritDoc}
4040
* @see \Codeception\Module::_beforeSuite()
4141
*/
42-
public function _beforeSuite($settings = [])
42+
public function _beforeSuite(array $settings = [])
4343
{
4444
$this->config = array_merge($this->config, $settings);
4545
Debug::debug(

tests/codeception.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ paths:
55
data: tests/_data
66
support: tests/_support
77
envs: tests/_envs
8+
output: tests/_output
89
settings:
910
bootstrap: _bootstrap.php
1011
colors: true

tests/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
- PhpBrowser

tests/tests/functional.suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Emulate web requests and make application process them
55
# Include one of framework modules (Symfony2, Yii2, Laravel5) to use it
66

7-
class_name: FunctionalTester
7+
actor: FunctionalTester
88
modules:
99
enabled:
1010
# add framework module here

tests/tests/unit.suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Suite for unit (internal) tests.
44

5-
class_name: UnitTester
5+
actor: UnitTester
66
modules:
77
enabled:
88
- Asserts

0 commit comments

Comments
 (0)