Skip to content

Commit

Permalink
Support php 8.4 (#38)
Browse files Browse the repository at this point in the history
  • Loading branch information
mstrelan authored Feb 3, 2025
1 parent 27e911f commit bbb220d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ endif
DRUSH=$(EXEC) ./bin/drush
DRUSH_INSTALL=$(DRUSH) -y site:install --account-pass=password
GIT_SWITCH=cd app && git switch
PHP_VERSION=8.3
PHP_VERSION=8.4

clean: composer minimal login

Expand Down Expand Up @@ -96,7 +96,7 @@ phpstan-baseline:
$(GIT_SWITCH) 11.1.x
make clean

11.x: php8.3
11.x: php8.4
$(GIT_SWITCH) 11.x
make clean

Expand All @@ -114,3 +114,6 @@ php8.2:

php8.3:
make start -e PHP_VERSION=8.3

php8.4:
make start -e PHP_VERSION=8.4
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Make commands should be executed on the host machine.
* `phpstan` - runs phpstan for core
* `phpstan-baseline` - generates phpstan baseline for core
* `10.2|10.3|10.4|10.5|11.0|11.1|11.x` - provides a clean environment with the specified Drupal version
* `php8.1|php8.2|php8.3` - starts the stack with the specified php version
* `php8.1|php8.2|php8.3|php8.4` - starts the stack with the specified php version

## PhpStorm configuration

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
php-fpm:
build:
args:
BASE_IMAGE: skpr/php-fpm:${PHP_VERSION:-8.3}-dev-v2-latest
BASE_IMAGE: skpr/php-fpm:${PHP_VERSION:-8.4}-dev-v2-latest
USERNAME: ${USERNAME:-skpr}
UID: ${UID:-1000}
GID: ${GID:-1000}
Expand All @@ -32,7 +32,7 @@ services:
php-cli:
build:
args:
BASE_IMAGE: skpr/php-cli:${PHP_VERSION:-8.3}-dev-v2-latest
BASE_IMAGE: skpr/php-cli:${PHP_VERSION:-8.4}-dev-v2-latest
USERNAME: ${USERNAME:-skpr}
UID: ${UID:-1000}
GID: ${GID:-1000}
Expand Down

0 comments on commit bbb220d

Please sign in to comment.