From 3deb8777356d83d834ebc1c835602f8bcc3829aa Mon Sep 17 00:00:00 2001 From: Dan Barrett Date: Sat, 12 Feb 2022 12:45:16 +1100 Subject: [PATCH 1/4] Removed redundant line in .gitattributes file --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 87f3679..2d44cfe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,6 +2,5 @@ /tests export-ignore /.gitattributes export-ignore /.gitignore export-ignore -/Robofile.php export-ignore /*.md export-ignore /*.yml export-ignore From 17f39b31830e94187546f950a114ac8ba6b3f76b Mon Sep 17 00:00:00 2001 From: Dan Barrett Date: Sat, 12 Feb 2022 12:49:00 +1100 Subject: [PATCH 2/4] Improved support for Codeception 5/PHP 8 --- readme.md | 2 +- src/Codeception/Module/PhpBrowser.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/readme.md b/readme.md index 144cbb8..3c26e32 100644 --- a/readme.md +++ b/readme.md @@ -9,7 +9,7 @@ A Codeception module for testing web application over HTTP. ## Requirements -* `PHP 7.4` or higher. +* `PHP 8.0` or higher. ## Installation diff --git a/src/Codeception/Module/PhpBrowser.php b/src/Codeception/Module/PhpBrowser.php index 672e4c1..0222876 100644 --- a/src/Codeception/Module/PhpBrowser.php +++ b/src/Codeception/Module/PhpBrowser.php @@ -83,12 +83,12 @@ class PhpBrowser extends InnerBrowser implements Remote, MultiSession /** * @var string[] */ - protected $requiredFields = ['url']; + protected array $requiredFields = ['url']; /** - * @var array + * @var array */ - protected $config = [ + protected array $config = [ 'headers' => [], 'verify' => false, 'expect' => false, From f6fdca344b33c6ac2e2abede158856a3bd24f7d3 Mon Sep 17 00:00:00 2001 From: Dan Barrett Date: Sat, 12 Feb 2022 12:49:28 +1100 Subject: [PATCH 3/4] Normalise and cleanup of composer.json --- composer.json | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index b0c3292..856fb98 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,13 @@ { "name": "codeception/module-phpbrowser", "description": "Codeception module for testing web application over HTTP", - "keywords": [ "codeception", "http", "functional-testing" ], - "homepage": "https://codeception.com/", - "type": "library", "license": "MIT", + "type": "library", + "keywords": [ + "codeception", + "http", + "functional-testing" + ], "authors": [ { "name": "Michael Bodnarchuk" @@ -13,18 +16,18 @@ "name": "Gintautas Miselis" } ], - "minimum-stability": "dev", + "homepage": "https://codeception.com/", "require": { "php": "^8.0", "ext-json": "*", - "guzzlehttp/guzzle": "^7.4", - "codeception/lib-innerbrowser": "^2.0 | *@dev", - "codeception/codeception": "^5.0.0-alpha1" + "codeception/codeception": "dev-5.0-interfaces as 5.0.0", + "codeception/lib-innerbrowser": "^2.0 || *@dev", + "guzzlehttp/guzzle": "^7.4" }, "require-dev": { "ext-curl": "*", "aws/aws-sdk-php": "^3.199", - "codeception/module-rest": "^2.0 | *@dev" + "codeception/module-rest": "^2.0 || *@dev" }, "conflict": { "codeception/codeception": "<5.0" @@ -32,12 +35,14 @@ "suggest": { "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests" }, + "minimum-stability": "dev", "autoload": { "classmap": [ "src/" ] }, "config": { - "classmap-authoritative": true + "classmap-authoritative": true, + "sort-packages": true } } From 04570537cf8e9296882daa70d2b8c9a0dee5b47e Mon Sep 17 00:00:00 2001 From: Dan Barrett Date: Sat, 12 Feb 2022 14:09:36 +1100 Subject: [PATCH 4/4] Update minimum requirement for `lib-innerbrowser` --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 856fb98..bbd2981 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "php": "^8.0", "ext-json": "*", "codeception/codeception": "dev-5.0-interfaces as 5.0.0", - "codeception/lib-innerbrowser": "^2.0 || *@dev", + "codeception/lib-innerbrowser": "^3.0", "guzzlehttp/guzzle": "^7.4" }, "require-dev": {