From 5f5e748e64b4c8dc2c477d99d5fc389d27814c4e Mon Sep 17 00:00:00 2001 From: Michael Petri Date: Tue, 7 Dec 2021 21:09:41 +0100 Subject: [PATCH 1/2] Added PHP 8.1 to CI pipeline --- .github/workflows/benchmarks.yml | 1 + .github/workflows/coding-standards.yml | 1 + .github/workflows/demo-scripts.yml | 1 + .github/workflows/mutation-tests.yml | 1 + .github/workflows/phpunit.yml | 1 + .github/workflows/psalm.yml | 1 + .github/workflows/xulieta.yml | 1 + composer.json | 2 +- composer.lock | 5 +++-- 9 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index b44b2f190..cfe42e130 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -16,6 +16,7 @@ jobs: - "locked" php-version: - "8.0" + - "8.1" operating-system: - "ubuntu-latest" diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index c28008ced..f2372129e 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -16,6 +16,7 @@ jobs: - "locked" php-version: - "8.0" + - "8.1" operating-system: - "ubuntu-latest" diff --git a/.github/workflows/demo-scripts.yml b/.github/workflows/demo-scripts.yml index 175ec19ea..ed3cc4a35 100644 --- a/.github/workflows/demo-scripts.yml +++ b/.github/workflows/demo-scripts.yml @@ -16,6 +16,7 @@ jobs: - "locked" php-version: - "8.0" + - "8.1" operating-system: - "ubuntu-latest" diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml index aef979669..509896982 100644 --- a/.github/workflows/mutation-tests.yml +++ b/.github/workflows/mutation-tests.yml @@ -16,6 +16,7 @@ jobs: - "locked" php-version: - "8.0" + - "8.1" operating-system: - "ubuntu-latest" diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index cbb617700..ee7a6014d 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -18,6 +18,7 @@ jobs: - "locked" php-version: - "8.0" + - "8.1" operating-system: - "ubuntu-latest" include: diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 138ccdc8c..2647e505a 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -16,6 +16,7 @@ jobs: - "locked" php-version: - "8.0" + - "8.1" operating-system: - "ubuntu-latest" diff --git a/.github/workflows/xulieta.yml b/.github/workflows/xulieta.yml index d564295bf..d360f6935 100644 --- a/.github/workflows/xulieta.yml +++ b/.github/workflows/xulieta.yml @@ -16,6 +16,7 @@ jobs: - "locked" php-version: - "8.0" + - "8.1" operating-system: - "ubuntu-latest" diff --git a/composer.json b/composer.json index 279f735cc..33134103e 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ } ], "require": { - "php": "~8.0.0", + "php": "~8.0.0 || ~8.0.0", "composer-runtime-api": "^2.1.0", "laminas/laminas-code": "^4.4.2", "webimpress/safe-writer": "^2.2.0" diff --git a/composer.lock b/composer.lock index cec4ae8d2..196d1ad6f 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": "da7e8e29fd166baf1cd0f010bacd1478", + "content-hash": "c6077e3749b74c31dc9ba7baab837d51", "packages": [ { "name": "laminas/laminas-code", @@ -6107,6 +6107,7 @@ "issues": "https://github.com/webmozart/path-util/issues", "source": "https://github.com/webmozart/path-util/tree/2.3.0" }, + "abandoned": "symfony/filesystem", "time": "2015-12-17T08:42:14+00:00" } ], @@ -6116,7 +6117,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.0.0", + "php": "~8.0.0 || ~8.0.0", "composer-runtime-api": "^2.1.0" }, "platform-dev": { From ab974161587c03936ca777058adb25db47c92d53 Mon Sep 17 00:00:00 2001 From: Michael Petri Date: Mon, 3 Jan 2022 08:34:39 +0100 Subject: [PATCH 2/2] Update composer.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Paweł Niedzielski --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 33134103e..43379397d 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ } ], "require": { - "php": "~8.0.0 || ~8.0.0", + "php": "~8.0.0 || ~8.1.0", "composer-runtime-api": "^2.1.0", "laminas/laminas-code": "^4.4.2", "webimpress/safe-writer": "^2.2.0"