Skip to content

Commit cb80904

Browse files
zero-to-proddavid_smith
andauthored
maint/php84 (#26)
* maint/php84 Updated `.github/workflows/test.yml`. * maint/php84 Updated `.gitignore`. * maint/php84 Updated `docker-compose.yml`. * maint/php84 Created `docker/php84/Dockerfile`. * maint/php84 Created `docker/php84/php.ini`. * maint/php84 Updated `test.sh`. * maint/php84 Updated `SECURITY.md`. * maint/php84 Updated `composer.json`. --------- Co-authored-by: david_smith <david_smith@sweetwater.com>
1 parent b64b35b commit cb80904

File tree

8 files changed

+63
-4
lines changed

8 files changed

+63
-4
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
php-version: [php81, php82, php83]
19+
php-version: [php81, php82, php83, php84]
2020

2121
steps:
2222
- uses: actions/checkout@v4

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ composer.lock
66
/.phpunit.cache/
77
/vendor-php81/
88
/vendor-php82/
9-
/vendor-php83/
9+
/vendor-php83/
10+
/vendor-php84/

SECURITY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
| 8.1.x | :white_check_mark: |
88
| 8.2.x | :white_check_mark: |
99
| 8.3.x | :white_check_mark: |
10+
| 8.4.x | :white_check_mark: |
1011

1112
## Reporting a Vulnerability
1213

composer.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
"data-model-helper"
88
],
99
"homepage": "https://github.com/zero-to-prod/data-model-helper",
10+
"support": {
11+
"email": "dave0016@gmail.com",
12+
"issues": "https://github.com/zero-to-prod/data-model-helper/issues",
13+
"source": "https://github.com/zero-to-prod/data-model",
14+
"docs": "https://zero-to-prod.github.io/data-model-helper/",
15+
"security": "https://github.com/zero-to-prod/data-model-helper/blob/main/SECURITY.md"
16+
},
1017
"license": "MIT",
1118
"readme": "./README.md",
1219
"authors": [

docker-compose.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,29 @@ services:
7272
target: composer
7373
volumes:
7474
- ./:/app
75-
- ./vendor-php83:/app/vendor
75+
- ./vendor-php83:/app/vendor
76+
77+
php84:
78+
build:
79+
context: docker/php84
80+
target: base
81+
volumes:
82+
- ./:/app
83+
- ./vendor-php84:/app/vendor
84+
85+
php84debug:
86+
build:
87+
context: docker/php84
88+
target: debug
89+
volumes:
90+
- ./:/app
91+
- ./docker/php84:/usr/local/etc/php
92+
- ./vendor-php84:/app/vendor
93+
94+
php84composer:
95+
build:
96+
context: docker/php84
97+
target: composer
98+
volumes:
99+
- ./:/app
100+
- ./vendor-php84:/app/vendor

docker/php84/Dockerfile

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
FROM php:8.4-cli AS base
2+
3+
WORKDIR /app
4+
5+
RUN apt-get update && apt-get install -y \
6+
git \
7+
unzip \
8+
&& rm -rf /var/lib/apt/lists/*
9+
10+
FROM base AS composer
11+
12+
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
13+
14+
FROM base AS debug
15+
16+
RUN pecl channel-update pecl.php.net && \
17+
pecl install xdebug && \
18+
docker-php-ext-enable xdebug && \
19+
echo "xdebug.mode=coverage" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
20+
21+
WORKDIR /app
22+
23+
CMD ["bash"]

docker/php84/php.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
zend_extension=xdebug.so
2+
xdebug.mode=coverage

test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33

4-
php_versions=("php83" "php82" "php81")
4+
php_versions=("php84" "php83" "php82" "php81")
55

66
for version in "${php_versions[@]}"; do
77
docker compose run --rm "${version}composer" composer update --no-cache

0 commit comments

Comments
 (0)