From 82993c6314b0f9da81a1cd4ea67515f60320857b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20B=C3=B6sing?= <2189546+boesing@users.noreply.github.com> Date: Thu, 26 Aug 2021 20:46:37 +0200 Subject: [PATCH 1/3] qa: add PHP 8.1 to `composer.json` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index dd04039..6229609 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ } }, "require": { - "php": "^7.3 || ~8.0.0", + "php": "^7.3 || ~8.0.0 || ~8.1.0", "laminas/laminas-authentication": "^2.6.0", "laminas/laminas-zendframework-bridge": "^1.0", "mezzio/mezzio-authentication": "^1.0", diff --git a/composer.lock b/composer.lock index a1ed5ee..3c1347c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e6ba3b11f474fde2732eed7f59ba9f96", + "content-hash": "e4013127f9fc2b99e0bc6dc0df7bcfa0", "packages": [ { "name": "laminas/laminas-authentication", @@ -3001,8 +3001,8 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.3 || ~8.0.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } From 675132f31b404db62a6055dc7a3c29ad74138b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20B=C3=B6sing?= <2189546+boesing@users.noreply.github.com> Date: Mon, 13 Sep 2021 22:55:23 +0200 Subject: [PATCH 2/3] qa: add/modify `.laminas-ci.json` to ignore PHP platform requirements for PHP 8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com> --- .laminas-ci.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .laminas-ci.json diff --git a/.laminas-ci.json b/.laminas-ci.json new file mode 100644 index 0000000..bce3fa2 --- /dev/null +++ b/.laminas-ci.json @@ -0,0 +1,5 @@ +{ + "ignore_php_platform_requirements": { + "8.1": true + } +} From b4c0e793c8df9a62635f4f108fb9ad0378f445e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20B=C3=B6sing?= <2189546+boesing@users.noreply.github.com> Date: Mon, 13 Sep 2021 23:58:19 +0200 Subject: [PATCH 3/3] qa: remove `laminas/laminas-zendframework-bridge` and conflict with zendframework pendant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com> --- composer.json | 5 ++--- composer.lock | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 6229609..1a24c2a 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,6 @@ "require": { "php": "^7.3 || ~8.0.0 || ~8.1.0", "laminas/laminas-authentication": "^2.6.0", - "laminas/laminas-zendframework-bridge": "^1.0", "mezzio/mezzio-authentication": "^1.0", "psr/container": "^1.0", "psr/http-message": "^1.0.1" @@ -57,7 +56,7 @@ "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, - "replace": { - "zendframework/zend-expressive-authentication-zendauthentication": "^1.0.1" + "conflict": { + "zendframework/zend-expressive-authentication-zendauthentication": "*" } } diff --git a/composer.lock b/composer.lock index 3c1347c..9967ccd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e4013127f9fc2b99e0bc6dc0df7bcfa0", + "content-hash": "ee6f4bdd90d22208b5a40854a1a1977d", "packages": [ { "name": "laminas/laminas-authentication", @@ -2661,6 +2661,7 @@ "type": "github" } ], + "abandoned": true, "time": "2020-09-28T06:45:17+00:00" }, {