Support for Codeception 5 (#13)

TavoNiievez · web-flow · commit 9815cb97f05d · 2021-06-06T21:21:24.000-05:00
diff --git a/.github/workflows/main.yml b/.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
diff --git a/composer.json b/composer.json
@@ -15,16 +15,17 @@
 	],
 	"minimum-stability": "RC",
 	"require": {
-		"php": "^7.1 || ^8.0",
-		"guzzlehttp/guzzle": "^6.3|^7.0",
-		"codeception/lib-innerbrowser": "^1.3",
-		"codeception/codeception": "*@dev"
+		"php": "^7.3 || ^8.0",
+		"ext-json": "*",
+		"guzzlehttp/guzzle": "^7.3",
+		"codeception/lib-innerbrowser": "^1.5 || *@dev",
+		"codeception/codeception": "^5.0 || *@dev"
 	},
 	"require-dev": {
-		"codeception/module-rest": "^1.0"
+		"codeception/module-rest": "^1.3 || *@dev"
 	},
 	"conflict": {
-		"codeception/codeception": "<4.0"
+		"codeception/codeception": "<5.0"
 	},
 	"suggest": {
 		"codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests"
diff --git a/readme.md b/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
 
diff --git a/src/Codeception/Lib/Connector/Guzzle.php b/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));
                 }
 
diff --git a/src/Codeception/Module/PhpBrowser.php b/src/Codeception/Module/PhpBrowser.php
@@ -219,7 +219,7 @@ public function _getResponseCode()
         return $this->getResponseStatusCode();
     }
 
-    public function _initializeSession()
+    public function _initializeSession(): void
     {
         // independent sessions need independent cookies
         $this->client = new Guzzle();
@@ -255,7 +255,7 @@ public function _prepareSession()
         $this->client->setClient($this->guzzle);
     }
 
-    public function _backupSession()
+    public function _backupSession(): array
     {
         return [
             'client' => $this->client,
@@ -265,14 +265,14 @@ public function _backupSession()
         ];
     }
 
-    public function _loadSession($session)
+    public function _loadSession($session): void
     {
         foreach ($session as $key => $val) {
             $this->$key = $val;
         }
     }
 
-    public function _closeSession($session = null)
+    public function _closeSession($session = null): void
     {
         unset($session);
     }
diff --git a/tests/unit/Codeception/Module/PhpBrowserRestTest.php b/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');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ protected function getAbsoluteUri($uri)`
`176`	`176`	`if (strpos($uri, '://') === false && strpos($uri, '//') !== 0) {`
`177`	`177`	`if (strpos($uri, '/') === 0) {`
`178`	`178`	`$baseUriPath = $baseUri->getPath();`
`179`		`- if (!empty($baseUriPath) && strpos($uri, $baseUriPath) === 0) {`
	`179`	`+ if (!empty($baseUriPath) && strpos($uri, (string) $baseUriPath) === 0) {`
`180`	`180`	`$uri = substr($uri, strlen($baseUriPath));`
`181`	`181`	`}`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ public function _getResponseCode()`
`219`	`219`	`return $this->getResponseStatusCode();`
`220`	`220`	`}`
`221`	`221`
`222`		`- public function _initializeSession()`
	`222`	`+ public function _initializeSession(): void`
`223`	`223`	`{`
`224`	`224`	`// independent sessions need independent cookies`
`225`	`225`	`$this->client = new Guzzle();`
`@@ -255,7 +255,7 @@ public function _prepareSession()`
`255`	`255`	`$this->client->setClient($this->guzzle);`
`256`	`256`	`}`
`257`	`257`
`258`		`- public function _backupSession()`
	`258`	`+ public function _backupSession(): array`
`259`	`259`	`{`
`260`	`260`	`return [`
`261`	`261`	`'client' => $this->client,`
`@@ -265,14 +265,14 @@ public function _backupSession()`
`265`	`265`	`];`
`266`	`266`	`}`
`267`	`267`
`268`		`- public function _loadSession($session)`
	`268`	`+ public function _loadSession($session): void`
`269`	`269`	`{`
`270`	`270`	`foreach ($session as $key => $val) {`
`271`	`271`	`$this->$key = $val;`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`
`275`		`- public function _closeSession($session = null)`
	`275`	`+ public function _closeSession($session = null): void`
`276`	`276`	`{`
`277`	`277`	`unset($session);`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,13 +133,13 @@ public function testArrayJson()`
`133`	`133`	`public function testSeeResponseContainsJsonFailsGracefullyWhenJsonResultIsNotArray()`
`134`	`134`	`{`
`135`	`135`	`$this->shouldFail();`
`136`		`- $this->setStubResponse(json_encode('no_status'));`
	`136`	`+ $this->setStubResponse(json_encode('no_status', JSON_THROW_ON_ERROR));`
`137`	`137`	`$this->module->seeResponseContainsJson(array('id' => 1));`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public function testDontSeeResponseJsonMatchesJsonPathPassesWhenJsonResultIsNotArray()`
`141`	`141`	`{`
`142`		`- $this->setStubResponse(json_encode('no_status'));`
	`142`	`+ $this->setStubResponse(json_encode('no_status', JSON_THROW_ON_ERROR));`
`143`	`143`	`$this->module->dontSeeResponseJsonMatchesJsonPath('$.error');`
`144`	`144`	`}`
`145`	`145`