Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATURE] Add support for PHP 8.4 #645

Merged
merged 1 commit into from
Nov 26, 2024
Merged

[FEATURE] Add support for PHP 8.4 #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/cgl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
4 changes: 2 additions & 2 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion installer/composer.json.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Fixtures/Templates/json-template/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Fixtures/Templates/yaml-template/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading