Skip to content

Commit

Permalink
Merge pull request #310 from PrestaShop/php8.4
Browse files Browse the repository at this point in the history
Bump PHP to 8.4
  • Loading branch information
Progi1984 authored Nov 25, 2024
2 parents fbf4790 + aba0599 commit d19d4fc
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/checkout@v3
Expand All @@ -33,6 +33,9 @@ jobs:
run: composer install --ansi --prefer-dist --no-interaction --no-progress

- name: Run PHPCSFixer
env:
## Useful until PHPCSFixer supports PHP 8.4
PHP_CS_FIXER_IGNORE_ENV: 1
run: ./vendor/bin/php-cs-fixer fix --dry-run --diff

- name: Run ergebnis/composer-normalize
Expand All @@ -48,7 +51,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -73,7 +76,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4
coverage: 'xdebug'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3-apache as builder
FROM php:8.4-apache as builder

RUN apt-get update && \
apt-get install -y \
Expand All @@ -15,7 +15,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1
RUN composer install


FROM php:8.3-apache
FROM php:8.4-apache

RUN apt-get update && \
apt-get install -y \
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=8.2",
"php": ">=8.4",
"ext-ctype": "*",
"ext-iconv": "*",
"beberlei/doctrineextensions": "^1.3",
Expand All @@ -21,7 +21,7 @@
},
"require-dev": {
"ergebnis/composer-normalize": "^2.41",
"friendsofphp/php-cs-fixer": "^3.45",
"friendsofphp/php-cs-fixer": "^3.65",
"phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^11.0",
"symfony/browser-kit": "~7.1.0",
Expand Down
8 changes: 4 additions & 4 deletions composer.lock

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

0 comments on commit d19d4fc

Please # to comment.