From e399100927b13733382ed1993f6b33c524f59cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 4 Dec 2024 18:19:00 +0100 Subject: [PATCH 1/3] Add PHP 8.4 support --- .github/workflows/test-unit.yml | 4 ++-- README.md | 2 +- composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index c7f4b1c7..f1919d09 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -64,13 +64,13 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.4', '8.0', '8.1', '8.2', '8.3'] + php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] type: ['Phpunit', 'Phpunit Lowest'] include: - php: 'latest' type: 'Phpunit Burn' env: - LOG_COVERAGE: "${{ fromJSON('{true: \"1\", false: \"\"}')[matrix.php == '8.3' && matrix.type == 'Phpunit' && (github.event_name == 'pull_request' || (github.event_name == 'push' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master')))] }}" + LOG_COVERAGE: "${{ fromJSON('{true: \"1\", false: \"\"}')[matrix.php == '8.4' && matrix.type == 'Phpunit' && (github.event_name == 'pull_request' || (github.event_name == 'push' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master')))] }}" services: mysql: image: mysql diff --git a/README.md b/README.md index d8f0d085..4c615963 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ php-lock/lock follows [semantic versioning][1]. ## Requirements - - PHP 7.4 - 8.3 + - PHP 7.4 - 8.4 - Optionally [nrk/predis][2] to use the Predis locks. - Optionally the [php-pcntl][3] extension to enable locking with `flock()` without busy waiting in CLI scripts. diff --git a/composer.json b/composer.json index ad455efd..e5850eeb 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ ], "homepage": "https://github.com/malkusch/lock", "require": { - "php": ">=7.4 <8.4", + "php": ">=7.4 <8.5", "psr/log": "^1.0 || ^2.0 || ^3.0", "symfony/polyfill-php80": "^1.28" }, From 23e5300e6f5e16999dae41488093d2052bf3c767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 6 Dec 2024 01:13:41 +0100 Subject: [PATCH 2/3] hotfix dep --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e5850eeb..96fa99ea 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "phpstan/phpstan-strict-rules": "^2.0", "phpunit/phpunit": "^9.5.25 || ^10.0 || ^11.0", "predis/predis": "^1.1.8", - "spatie/async": "^1.5" + "spatie/async": "dev-main#570d7a70671d22e82fe2bac2601551b82ff83af3 as 1.5.0" }, "suggest": { "ext-igbinary": "To use this library with PHP Redis igbinary serializer enabled.", From c379129768874341100d5afa6d8cd0cf87cff4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 17 Dec 2024 02:33:20 +0100 Subject: [PATCH 3/3] Revert "hotfix dep" --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 96fa99ea..e5850eeb 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "phpstan/phpstan-strict-rules": "^2.0", "phpunit/phpunit": "^9.5.25 || ^10.0 || ^11.0", "predis/predis": "^1.1.8", - "spatie/async": "dev-main#570d7a70671d22e82fe2bac2601551b82ff83af3 as 1.5.0" + "spatie/async": "^1.5" }, "suggest": { "ext-igbinary": "To use this library with PHP Redis igbinary serializer enabled.",