diff --git a/composer.json b/composer.json index 4afa4a1..ac0b3a0 100644 --- a/composer.json +++ b/composer.json @@ -24,17 +24,16 @@ "description" : "Wiremock extension for Codeception", "license" : "GPL-3.0+", "require" : { - "php" : ">=5.6", - "codeception/codeception" : "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", - "wiremock-php/wiremock-php" : "^2.18" + "php" : ">=8.0", + "codeception/codeception" : "^5.0.0", + "wiremock-php/wiremock-php" : "^2.35.1" }, "require-dev" : { - "phing/phing" : "^2.12.0", - "squizlabs/php_codesniffer" : "^2.3.4", - "phpmd/phpmd" : "^2.3.2", - "sebastian/phpcpd" : "^2.0.2", - "pdepend/pdepend" : "^2.0.6", - "phploc/phploc" : "^2.1.1", - "phpdocumentor/phpdocumentor" : "^2.8.5" + "phing/phing" : "^2.17.4", + "squizlabs/php_codesniffer" : "^3.7.2", + "phpmd/phpmd" : "^2.13.0", + "pdepend/pdepend" : "^2.13.0", + "codeception/module-phpbrowser": "^3.0", + "codeception/module-asserts": "^3.0" } } diff --git a/src/Extension/WireMock.php b/src/Extension/WireMock.php index 6ba6a4f..ce061ad 100644 --- a/src/Extension/WireMock.php +++ b/src/Extension/WireMock.php @@ -17,7 +17,7 @@ */ namespace Codeception\Extension; -use Codeception\Platform\Extension as CodeceptionExtension; +use Codeception\Extension as CodeceptionExtension; use WireMock\Client\WireMock as WireMockClient; /** diff --git a/src/Extension/WireMockArguments.php b/src/Extension/WireMockArguments.php index cad9f78..9fdbc41 100644 --- a/src/Extension/WireMockArguments.php +++ b/src/Extension/WireMockArguments.php @@ -68,7 +68,7 @@ class WireMockArguments */ public function __construct() { - $this->defaults['logs-path'] = Config::logDir(); + $this->defaults['logs-path'] = Config::outputDir(); } /** diff --git a/src/Module/WireMock.php b/src/Module/WireMock.php index f6c39c4..93a1856 100644 --- a/src/Module/WireMock.php +++ b/src/Module/WireMock.php @@ -30,7 +30,7 @@ class WireMock extends CodeceptionModule */ private $wireMock; - protected $config = [ + protected array $config = [ 'host' => 'localhost', 'port' => '8080' ]; @@ -39,7 +39,7 @@ class WireMock extends CodeceptionModule * {@inheritDoc} * @see \Codeception\Module::_beforeSuite() */ - public function _beforeSuite($settings = []) + public function _beforeSuite(array $settings = []) { $this->config = array_merge($this->config, $settings); Debug::debug( diff --git a/tests/codeception.yml b/tests/codeception.yml index 6274405..316e806 100644 --- a/tests/codeception.yml +++ b/tests/codeception.yml @@ -5,6 +5,7 @@ paths: data: tests/_data support: tests/_support envs: tests/_envs + output: tests/_output settings: bootstrap: _bootstrap.php colors: true diff --git a/tests/tests/acceptance.suite.yml b/tests/tests/acceptance.suite.yml index 0773e5d..498703c 100644 --- a/tests/tests/acceptance.suite.yml +++ b/tests/tests/acceptance.suite.yml @@ -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: - PhpBrowser diff --git a/tests/tests/functional.suite.yml b/tests/tests/functional.suite.yml index 075765b..20b74e2 100644 --- a/tests/tests/functional.suite.yml +++ b/tests/tests/functional.suite.yml @@ -4,7 +4,7 @@ # Emulate web requests and make application process them # Include one of framework modules (Symfony2, Yii2, Laravel5) to use it -class_name: FunctionalTester +actor: FunctionalTester modules: enabled: # add framework module here diff --git a/tests/tests/unit.suite.yml b/tests/tests/unit.suite.yml index 02dc9b1..087b80a 100644 --- a/tests/tests/unit.suite.yml +++ b/tests/tests/unit.suite.yml @@ -2,7 +2,7 @@ # # Suite for unit (internal) tests. -class_name: UnitTester +actor: UnitTester modules: enabled: - Asserts