From 111fb961687d4f7385a08c7e0acce557c91fdaef Mon Sep 17 00:00:00 2001
From: Olivier Laviale <olivier.laviale@gmail.com>
Date: Fri, 29 Nov 2024 16:06:22 +0100
Subject: [PATCH] Require PHP 8.4+

---
 .github/workflows/code-style.yml      |  2 +-
 .github/workflows/static-analysis.yml |  2 +-
 .github/workflows/test.yml            |  4 +---
 CHANGELOG.md                          | 26 +++++++++++++++++++++++++-
 Dockerfile                            |  2 +-
 Makefile                              |  7 +------
 composer.json                         |  8 ++++----
 docker-compose.yaml                   | 11 -----------
 8 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
index ca5ce00..ce3b7e8 100644
--- a/.github/workflows/code-style.yml
+++ b/.github/workflows/code-style.yml
@@ -14,7 +14,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         coverage: none
-        php-version: "8.2"
+        php-version: "8.4"
         ini-values: memory_limit=-1
         tools: phpcs, cs2pr
     - name: Run PHP Code Sniffer
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 81f7cd9..5cc3b12 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: "8.2"
+        php-version: "8.4"
         ini-values: memory_limit=-1
         tools: composer:v2
     - name: Cache dependencies
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6d1a684..b591f62 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,8 +11,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-        - "8.2"
-        - "8.3"
         - "8.4"
     steps:
     - name: Checkout
@@ -40,7 +38,7 @@ jobs:
       run: make test-coveralls
 
     - name: Upload code coverage
-      if: ${{ matrix.php-version == '8.2' }}
+      if: ${{ matrix.php-version == '8.4' }}
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 358b8a8..5028940 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,35 @@
 # CHANGELOG
 
-## v5.x to v6.0
+## v7.0
 
 ### New Requirements
 
+PHP 8.4+
+
+### New features
+
+None
+
+### Deprecated Features
+
+None
+
+### Backward Incompatible Changes
+
 None
 
+### Other Changes
+
+None
+
+
+
+## v5.x to v6.0
+
+### New Requirements
+
+PHP 8.2+
+
 ### New features
 
 None
diff --git a/Dockerfile b/Dockerfile
index bd635c7..4b767e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.2
+ARG PHP_VERSION=8.4
 FROM php:${PHP_VERSION}-cli-bookworm
 
 RUN <<-EOF
diff --git a/Makefile b/Makefile
index a8c8b14..e195372 100644
--- a/Makefile
+++ b/Makefile
@@ -26,12 +26,7 @@ test-coveralls: test-dependencies
 	@$(PHPUNIT) --coverage-clover ../build/logs/clover.xml
 
 .PHONY: test-container
-test-container: test-container-82
-
-.PHONY: test-container-82
-test-container-82:
-	@-docker compose run --rm app82 bash
-	@docker compose down -v
+test-container: test-container-84
 
 .PHONY: test-container-84
 test-container-84:
diff --git a/composer.json b/composer.json
index 1df0b14..8da71f9 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
 	"description": "Binds icanboogie/http to ICanBoogie",
 	"homepage": "https://icanboogie.org/",
 	"license": "MIT",
-	"version": "6.0",
+	"version": "7.0",
 	"authors": [
 		{
 			"name": "Olivier Laviale",
@@ -26,9 +26,9 @@
 	"minimum-stability": "dev",
 	"prefer-stable": true,
 	"require": {
-		"php": ">=8.2",
-		"icanboogie/icanboogie": "^6.0",
-		"icanboogie/http": "^6.0"
+		"php": ">=8.4",
+		"icanboogie/icanboogie": "^7.0",
+		"icanboogie/http": "^7.0"
 	},
 	"require-dev": {
 		"phpstan/phpstan": "^2.0",
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6a09071..e077237 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,16 +1,5 @@
 ---
 services:
-  app82:
-    build:
-      context: .
-      args:
-        PHP_VERSION: "8.2"
-    environment:
-      PHP_IDE_CONFIG: 'serverName=icanboogie-bind-http'
-    volumes:
-      - .:/app:delegated
-      - ~/.composer:/root/.composer:delegated
-    working_dir: /app
   app84:
     build:
       context: .