Skip to content

Commit e1b0747

Browse files
authored
Merge branch 'codecept5' into upgrade-to-php8
2 parents d0bbc23 + 12ea54d commit e1b0747

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
strategy:
1010
matrix:
11-
php: [7.4, 8.0]
11+
php: [8.0, 8.1]
1212

1313
steps:
1414
- name: Checkout code

composer.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,21 @@
1010
"name":"Gintautas Miselis"
1111
}
1212
],
13-
"minimum-stability": "RC",
13+
"minimum-stability": "dev",
1414
"require": {
1515
"php": "^8.0",
1616
"ext-dom": "*",
1717
"ext-json": "*",
18-
"codeception/codeception": "^4.1",
18+
"codeception/codeception": "^5.0.0-alpha1",
1919
"justinrainbow/json-schema": "~5.2.9",
2020
"softcreatr/jsonpath": "^0.8"
2121
},
2222
"require-dev": {
23+
"ext-libxml": "*",
24+
"ext-simplexml": "*",
2325
"codeception/stub": "^4.0",
2426
"codeception/util-universalframework": "^1.0",
25-
"codeception/lib-innerbrowser": "^2.0"
27+
"codeception/lib-innerbrowser": "^2.0 | *@dev"
2628
},
2729
"suggest": {
2830
"aws/aws-sdk-php": "For using AWS Auth"

src/Codeception/Module/REST.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -148,20 +148,20 @@ protected function resetVariables(): void
148148
$this->connectionModule->headers = [];
149149
}
150150

151-
public function _conflicts()
151+
public function _conflicts(): string
152152
{
153153
return \Codeception\Lib\Interfaces\API::class;
154154
}
155155

156-
public function _depends()
156+
public function _depends(): array
157157
{
158158
return [InnerBrowser::class => $this->dependencyMessage];
159159
}
160160

161161
/**
162162
* @return string[]
163163
*/
164-
public function _parts()
164+
public function _parts(): array
165165
{
166166
return ['xml', 'json'];
167167
}

src/Codeception/Step/AsJson.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function run(ModuleContainer $container = null)
1515
return json_decode($resp, true);
1616
}
1717

18-
public static function getTemplate(Template $template)
18+
public static function getTemplate(Template $template): ?Template
1919
{
2020
$action = $template->getVar('action');
2121

@@ -29,4 +29,4 @@ public static function getTemplate(Template $template)
2929
->place('action', $action . 'AsJson')
3030
->place('step', 'AsJson');
3131
}
32-
}
32+
}

0 commit comments

Comments
 (0)