Skip to content

Commit

Permalink
feat: Support PHP 8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
LeSuisse committed Dec 31, 2024
1 parent a6a9c68 commit fbecb61
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI-Experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
tests:
name: Tests on PHP 8.4 nightly
name: Tests on PHP 8.5 nightly
runs-on: ubuntu-24.04
services:
redis:
Expand All @@ -22,7 +22,7 @@ jobs:
uses: actions/checkout@v4
- uses: shivammathur/setup-php@2.32.0
with:
php-version: '8.4'
php-version: '8.5'
extensions: mbstring, redis, apcu
ini-values: apc.enable_cli=1, zend.assertions=1
coverage: none
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
- 6379/tcp
strategy:
matrix:
php: ['8.1', '8.2', '8.3']
dependencies: ['', '--prefer-lowest --prefer-stable']
php: ['8.1', '8.2', '8.3', '8.4']
dependencies: ['--ignore-platform-req=php', '--prefer-lowest --prefer-stable --ignore-platform-req=php']
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
php: ['8.1', '8.2', '8.3']
php: ['8.1', '8.2', '8.3', '8.4']
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Prometheus instrumentation library",
"license": "Apache-2.0",
"require": {
"php": "~8.1.0|~8.2.0|~8.3.0",
"php": "~8.1.0|~8.2.0|~8.3.0|~8.4.0",
"ext-json": "*",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

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

4 changes: 2 additions & 2 deletions php-fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG PHP_VERSION
FROM php:${PHP_VERSION}-fpm

RUN pecl install redis-5.3.4 && \
pecl install apcu-5.1.21 && \
RUN pecl install redis-6.1.0 && \
pecl install apcu-5.1.24 && \
docker-php-ext-enable redis apcu

COPY www.conf /usr/local/etc/php-fpm.d/
Expand Down

0 comments on commit fbecb61

Please sign in to comment.