From 1c13b12ae5ef901974fa192d1bc2a68f1dc1fc58 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Thu, 29 Feb 2024 13:03:05 +0100
Subject: [PATCH 1/4] fix(deps): composer now also requires PHP 8.2+
---
php/composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/php/composer.json b/php/composer.json
index efb015e53..f7667b3d9 100644
--- a/php/composer.json
+++ b/php/composer.json
@@ -13,7 +13,7 @@
}
},
"require": {
- "php": "^8.1",
+ "php": "^8.2",
"ext-mbstring": "*",
"cucumber/messages": ">=19.1.4 <=24"
},
From 254cc8fb610c36d5dc7468f6ed28d0b4c0e259b3 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Thu, 29 Feb 2024 13:04:34 +0100
Subject: [PATCH 2/4] CHANGELOG.md: Mention changes to PHP
---
CHANGELOG.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73a5cc93e..f8d415379 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
## [Unreleased]
+### Changed
+- [PHP] Require PHP 8.2+ in CI and in composer.json.
+
## [28.0.0] - 2024-02-15
### Added
- [Python] Added release workflow for releasing to Pypi ([#213](https://github.com/cucumber/gherkin/pull/213))
From 142388bc5493dc6c22ceb861239d6bfe33e2d8a8 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Thu, 29 Feb 2024 13:34:16 +0100
Subject: [PATCH 3/4] [PHP] Try updating PHP dev deps
---
php/composer.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/php/composer.json b/php/composer.json
index f7667b3d9..d5bd61f0c 100644
--- a/php/composer.json
+++ b/php/composer.json
@@ -18,11 +18,11 @@
"cucumber/messages": ">=19.1.4 <=24"
},
"require-dev": {
- "phpunit/phpunit": "^10.0",
- "vimeo/psalm": "5.19.1",
+ "phpunit/phpunit": "^11.0",
+ "vimeo/psalm": "^5.22.2",
"friendsofphp/php-cs-fixer": "^3.5",
"psalm/plugin-phpunit": "^0.18.0",
- "nikic/php-parser": "^4.14"
+ "nikic/php-parser": "^5.0.1"
},
"repositories": [
{
From a1d65e0ad942ffa26584b99735cfb3d056bfda06 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Thu, 29 Feb 2024 13:37:56 +0100
Subject: [PATCH 4/4] [PHP] try with a 4.x dep
---
php/composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/php/composer.json b/php/composer.json
index d5bd61f0c..789ab2ea4 100644
--- a/php/composer.json
+++ b/php/composer.json
@@ -22,7 +22,7 @@
"vimeo/psalm": "^5.22.2",
"friendsofphp/php-cs-fixer": "^3.5",
"psalm/plugin-phpunit": "^0.18.0",
- "nikic/php-parser": "^5.0.1"
+ "nikic/php-parser": "^4.16"
},
"repositories": [
{