Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
"require": {
"php": "^7.4 | ^8.0",
"ext-json": "*",
"guzzlehttp/guzzle": "^7.3",
"codeception/lib-innerbrowser": "^1.5 | *@dev",
"codeception/codeception": "^4.0 | *@dev"
"guzzlehttp/guzzle": "^7.4",
"codeception/lib-innerbrowser": "^2.0 | *@dev",
"codeception/codeception": "^4.1 | *@dev"
},
"require-dev": {
"ext-curl": "*",
"aws/aws-sdk-php": "^3.199",
"codeception/module-rest": "^1.3 | *@dev"
"codeception/module-rest": "^2.0 | *@dev"
},
"conflict": {
"codeception/codeception": "<4.0"
"codeception/codeception": "<4.1"
},
"suggest": {
"codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests"
Expand Down
2 changes: 1 addition & 1 deletion src/Codeception/Lib/Connector/Guzzle.php
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ protected function getAbsoluteUri($uri)

// relative url
if (!$this->getHistory()->isEmpty()) {
return Uri::mergeUrls((string)$this->getHistory()->current()->getUri(), $uri);
return Uri::mergeUrls($this->getHistory()->current()->getUri(), $uri);
}
}

Expand Down