From 7cd316888dfa06919b8790e74d9049ef0cdb6ca0 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 17 Oct 2021 21:30:51 +0100 Subject: [PATCH 1/5] Test on PHP 8.1 --- .github/workflows/tests.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index abfeb57..9639221 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['7.1', '7.2', '7.3', '7.4', '8.0'] + php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] steps: - name: Checkout code @@ -23,15 +23,8 @@ jobs: tools: composer:v2 coverage: none - - name: Install PHP 7 dependencies + - name: Install PHP dependencies run: composer update --prefer-dist --no-interaction --no-progress - if: "matrix.php != '8.0'" - - - name: Install PHP 8 dependencies - run: | - composer require "phpunit/phpunit:^9.3@dev" "phpunit/php-code-coverage:^9.0@dev" "sebastian/global-state:^5.0@dev" "phpdocumentor/reflection-docblock:^5.2@dev" --no-interaction --no-update - composer update --prefer-dist --no-interaction --no-progress --ignore-platform-req=php - if: "matrix.php == '8.0'" - name: Execute tests run: composer test From 9ee7e76b6645b45632f6ac3308e07e1ec473bb8e Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 17 Oct 2021 21:33:00 +0100 Subject: [PATCH 2/5] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7e746f0..de643ec 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "doctrine/instantiator": "^1.1", "guzzlehttp/psr7": "^1.4", "nyholm/psr7": "^1.2", - "phpspec/phpspec": "^5.1 || ^6.0", + "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0", "phpspec/prophecy": "^1.10.2", "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" }, From f70f6ec7bb26e91addd7fff603802b9091c71003 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 17 Oct 2021 21:35:07 +0100 Subject: [PATCH 3/5] Update tests.yml --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9639221..8013114 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,6 +26,12 @@ jobs: - name: Install PHP dependencies run: composer update --prefer-dist --no-interaction --no-progress + - name: Require PHPSpec 7.1 dependencies + run: | + composer require "phpspec/phpspec:^7.1@dev" --no-interaction --no-update + composer update --prefer-dist --no-interaction --no-progress --ignore-platform-req=php + if: "matrix.php == '8.1'" + - name: Execute tests run: composer test From cd92d2e97eab6b165668e1a3aa83c1f2564a10eb Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 17 Oct 2021 21:35:43 +0100 Subject: [PATCH 4/5] Update tests.yml --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8013114..e8eabc3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,15 +23,15 @@ jobs: tools: composer:v2 coverage: none - - name: Install PHP dependencies - run: composer update --prefer-dist --no-interaction --no-progress - - name: Require PHPSpec 7.1 dependencies run: | composer require "phpspec/phpspec:^7.1@dev" --no-interaction --no-update composer update --prefer-dist --no-interaction --no-progress --ignore-platform-req=php if: "matrix.php == '8.1'" + - name: Install PHP dependencies + run: composer update --prefer-dist --no-interaction --no-progress + - name: Execute tests run: composer test From 9b7c5dcaea22cc49ef630fca36039c694f655542 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 17 Oct 2021 21:36:13 +0100 Subject: [PATCH 5/5] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index de643ec..091a1d9 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "doctrine/instantiator": "^1.1", "guzzlehttp/psr7": "^1.4", "nyholm/psr7": "^1.2", - "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", "phpspec/prophecy": "^1.10.2", "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" },