Support for Codeception 5

Author: TavoNiievez

.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.1, 7.2, 7.3, 7.4, 8.0]
+        php: [7.3, 7.4, 8.0]
 
     steps:
     - name: Checkout code

composer.json

@@ -15,16 +15,16 @@
 	],
 	"minimum-stability": "RC",
 	"require": {
-		"php": "^7.1 || ^8.0",
-		"guzzlehttp/guzzle": "^6.3|^7.0",
-		"codeception/lib-innerbrowser": "^1.3",
+		"php": "^7.3 || ^8.0",
+		"guzzlehttp/guzzle": "^7.3",
+		"codeception/lib-innerbrowser": "^1.5",
 		"codeception/codeception": "*@dev"
 	},
 	"require-dev": {
-		"codeception/module-rest": "^1.0"
+		"codeception/module-rest": "^1.3"
 	},
 	"conflict": {
-		"codeception/codeception": "<4.0"
+		"codeception/codeception": "<4.1"
 	},
 	"suggest": {
 		"codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests"

readme.md

@@ -9,7 +9,7 @@ A Codeception module for testing web application over HTTP.
 
 ## Requirements
 
-* `PHP 7.1` or higher.
+* `PHP 7.3` or higher.
 
 ## Installation
 

src/Codeception/Lib/Connector/Guzzle.php

@@ -176,7 +176,7 @@ protected function getAbsoluteUri($uri)
         if (strpos($uri, '://') === false && strpos($uri, '//') !== 0) {
             if (strpos($uri, '/') === 0) {
                 $baseUriPath = $baseUri->getPath();
-                if (!empty($baseUriPath) && strpos($uri, $baseUriPath) === 0) {
+                if (!empty($baseUriPath) && strpos($uri, (string) $baseUriPath) === 0) {
                     $uri = substr($uri, strlen($baseUriPath));
                 }
 

tests/data/rest/server.php

@@ -17,14 +17,14 @@ function RESTServer()
         if ($_SERVER['REQUEST_METHOD'] == 'GET') {
             $data = $_GET;
         } else if ($tmp = file_get_contents('php://input')) {
-            $data = json_decode($tmp);
+            $data = json_decode($tmp, null, 512, JSON_THROW_ON_ERROR);
         }
 
         $response = call_user_func($callback, $data);
         if (is_scalar($response)) {
             print $response;
             return;
         }
-        print json_encode($response);
+        print json_encode($response, JSON_THROW_ON_ERROR);
     }
 }

tests/unit/Codeception/Module/PhpBrowserRestTest.php

@@ -133,13 +133,13 @@ public function testArrayJson()
     public function testSeeResponseContainsJsonFailsGracefullyWhenJsonResultIsNotArray()
     {
         $this->shouldFail();
-        $this->setStubResponse(json_encode('no_status'));
+        $this->setStubResponse(json_encode('no_status', JSON_THROW_ON_ERROR));
         $this->module->seeResponseContainsJson(array('id' => 1));
     }
 
     public function testDontSeeResponseJsonMatchesJsonPathPassesWhenJsonResultIsNotArray()
     {
-        $this->setStubResponse(json_encode('no_status'));
+        $this->setStubResponse(json_encode('no_status', JSON_THROW_ON_ERROR));
         $this->module->dontSeeResponseJsonMatchesJsonPath('$.error');
     }