Merge pull request #645 from CPS-IT/feature/php-8.4

CPS-IT · Nov 26, 2024 · 4a33a96 · 4a33a96
2 parents 7b39fad + 17e85a2
commit 4a33a96
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/cgl.yaml b/.github/workflows/cgl.yaml
@@ -19,7 +19,8 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          # @todo Use PHP 8.4 once PHP-CS-Fixer supports it
+          php-version: 8.3
           tools: composer:v2, composer-require-checker, composer-unused, cs2pr
           coverage: none
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -14,9 +14,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ["8.1", "8.2", "8.3"]
+        php-version: ["8.1", "8.2", "8.3", "8.4"]
         composer-version: ["2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8"]
         dependencies: ["highest", "lowest"]
+        # Skip tests for PHP 8.4 and incompatible Composer versions
+        exclude:
+          - php-version: "8.4"
+            composer-version: "2.1"
+          - php-version: "8.4"
+            composer-version: "2.2"
+          - php-version: "8.4"
+            composer-version: "2.3"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -54,7 +62,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           tools: composer:v2
           coverage: pcov
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM composer/composer:2.8-bin AS composer
 LABEL maintainer="Elias Häußler <[email protected]>"
 
-FROM php:8.3-alpine
+FROM php:8.4-alpine
 COPY --from=composer /composer /usr/bin/composer
 
 ENV COMPOSER_ALLOW_SUPERUSER=1

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
 		}
 	],
 	"require": {
-		"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+		"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
 		"ext-filter": "*",
 		"ext-json": "*",
 		"ext-mbstring": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/installer/composer.json.twig b/installer/composer.json.twig
@@ -3,7 +3,7 @@
 	"description": "Template installer for cpsit/project-builder",
 	"license": "GPL-3.0-or-later",
 	"require": {
-		"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+		"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
 		"composer/installers": "^2.0",
 		"oomphinc/composer-installers-extender": "^2.0",
 {% for templateSource in templateSources %}

diff --git a/tests/src/Fixtures/Templates/json-template/composer.json b/tests/src/Fixtures/Templates/json-template/composer.json
@@ -2,7 +2,7 @@
 	"name": "cpsit/project-builder-template-json",
 	"type": "project-builder-template",
 	"require": {
-		"php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+		"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^9.5"

diff --git a/tests/src/Fixtures/Templates/yaml-template/composer.json b/tests/src/Fixtures/Templates/yaml-template/composer.json
@@ -2,7 +2,7 @@
 	"name": "cpsit/project-builder-template-yaml",
 	"type": "project-builder-template",
 	"require": {
-		"php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+		"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^9.5"