diff --git a/.github/workflows/CI-Experimental.yml b/.github/workflows/CI-Experimental.yml index 90a7f3d2..63c01a47 100644 --- a/.github/workflows/CI-Experimental.yml +++ b/.github/workflows/CI-Experimental.yml @@ -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: @@ -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 diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index cc83784e..060a79b9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -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 @@ -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 diff --git a/composer.json b/composer.json index f8b1417e..51957226 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/composer.lock b/composer.lock index e8e1dec2..875c1a7c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7291f42159b41e4ab1ab97cd4e246187", + "content-hash": "d526cc0a07aad408956878d261773a97", "packages": [ { "name": "psr/http-client", @@ -1872,12 +1872,12 @@ "version": "v5.2.13", "source": { "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", + "url": "https://github.com/jsonrainbow/json-schema.git", "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, @@ -4976,12 +4976,12 @@ "version": "3.7.2", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", "shasum": "" }, @@ -6378,7 +6378,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "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": "*" }, "platform-dev": [], diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index ff9d37ea..fc7abadd 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -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/