Skip to content

Commit c0aeeba

Browse files
authored
Merge pull request php-vcr#416 from dmnlk/feature/php84
add PHP 8.4 support
2 parents ca99693 + 16d202b commit c0aeeba

4 files changed

Lines changed: 55 additions & 1 deletion

File tree

.github/workflows/continuous integration.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ jobs:
9191
- "8.1"
9292
- "8.2"
9393
- "8.3"
94+
- "8.4"
9495
dependencies:
9596
- "lowest"
9697
- "highest"

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^8,<8.2|>=8.2.9,<8.4",
19+
"php": "^8,<8.2|>=8.2.9,<8.5",
2020
"ext-curl": "*",
2121
"beberlei/assert": "^3.2.5",
2222
"symfony/yaml": "^3|^4|^5|^6|^7",

docker-compose.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,16 @@ services:
4040
volumes:
4141
- .:/var/www/html
4242
- ~/.composer:/home/user/.composer
43+
workspace84:
44+
tty: true
45+
build:
46+
context: resources/docker/workspace/8.4
47+
args:
48+
PUID: "${PUID:-1000}"
49+
PGID: "${PGID:-1000}"
50+
volumes:
51+
- .:/var/www/html
52+
- ~/.composer:/home/user/.composer
53+
54+
55+
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
FROM php:8.4-cli-alpine
2+
3+
ARG PUID=1000
4+
ARG PGID=1000
5+
6+
RUN apk add --no-cache --virtual .build-deps \
7+
# for extensions
8+
$PHPIZE_DEPS \
9+
# for soap
10+
libxml2-dev \
11+
# for xdebug \
12+
linux-headers \
13+
&& \
14+
apk add --no-cache \
15+
bash \
16+
# for soap
17+
libxml2 \
18+
# for composer
19+
unzip \
20+
&& \
21+
docker-php-ext-install soap \
22+
&& \
23+
pecl install \
24+
# pcov for coverage runs
25+
pcov && docker-php-ext-enable pcov \
26+
&& \
27+
# for debugging
28+
pecl install xdebug-3.4.0 && docker-php-ext-enable xdebug \
29+
&& \
30+
apk del .build-deps
31+
32+
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
33+
34+
WORKDIR /var/www/html
35+
36+
# Add a non-root user to prevent files being created with root permissions on host machine.
37+
RUN addgroup -g ${PGID} user && \
38+
adduser -u ${PUID} -G user -D user
39+
40+
USER user

0 commit comments

Comments
 (0)