Skip to content

Commit

Permalink
Require PHP 8.4+
Browse files Browse the repository at this point in the history
  • Loading branch information
olvlvl committed Jan 11, 2025
1 parent 84fe2f6 commit 03c62a0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 31 deletions.
16 changes: 6 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
ARG PHP_VERSION=8.2
ARG PHP_VERSION=8.4
FROM php:${PHP_VERSION}-cli-bookworm

RUN <<-EOF
docker-php-ext-enable opcache

if [ "$PHP_VERSION" \< "8.4" ]; then
apt-get update
apt-get install -y autoconf pkg-config
pecl channel-update pecl.php.net
pecl install xdebug
docker-php-ext-enable xdebug
fi
apt-get update
apt-get install -y autoconf pkg-config
pecl channel-update pecl.php.net
pecl install xdebug
docker-php-ext-enable opcache xdebug
EOF

RUN <<-EOF
Expand Down
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@ test-cleanup:
@# nothing

.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:
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=8.2",
"icanboogie/activerecord": "^6.0",
"icanboogie/icanboogie": "^6.0"
"php": ">=8.4",
"icanboogie/activerecord": "^7.0",
"icanboogie/icanboogie": "^7.0"
},
"require-dev": {
"phpstan/phpstan": "^2.0",
Expand Down
13 changes: 1 addition & 12 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
---
services:
app82:
build:
context: .
args:
PHP_VERSION: "8.2"
environment:
PHP_IDE_CONFIG: 'serverName=icanboogie-bind-activerecord'
volumes:
- .:/app:delegated
- ~/.composer:/root/.composer:delegated
working_dir: /app
app84:
build:
context: .
args:
PHP_VERSION: "8.4.0RC4"
PHP_VERSION: "8.4"
environment:
PHP_IDE_CONFIG: 'serverName=icanboogie-bind-activerecord'
volumes:
Expand Down

0 comments on commit 03c62a0

Please sign in to comment.