Add PHP 8.1 support

Experimental pipeline is now tested against PHP 8.2 nightly.
Enalean · Nov 24, 2021 · 4faed6a · 4faed6a
1 parent 0255df5
commit 4faed6a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/CI-Experimental.yml b/.github/workflows/CI-Experimental.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   tests:
-    name: Tests on PHP 8.1 nightly
+    name: Tests on PHP 8.2 nightly
     runs-on: ubuntu-20.04
     services:
       redis:
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v2.4.0
       - uses: shivammathur/setup-php@2.15.0
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           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
@@ -19,7 +19,7 @@ jobs:
           - 6379/tcp
     strategy:
       matrix:
-        php: ['8.0']
+        php: ['8.0', '8.1']
         dependencies: ['', '--prefer-lowest --prefer-stable']
     steps:
       - name: Checkout
@@ -78,7 +78,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: [ '8.0' ]
+        php: ['8.0', '8.1-rc']
     steps:
       - name: Checkout
         uses: actions/checkout@v2.4.0

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Prometheus instrumentation library",
     "license": "Apache-2.0",
     "require": {
-        "php": "~8.0.0",
+        "php": "~8.0.0|~8.1.0",
         "ext-json": "*",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
@@ -19,7 +19,7 @@
         "phpstan/phpstan": "^1.2",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.1",
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^9.5.10",
         "psalm/plugin-phpunit": "^0.16.0",
         "vimeo/psalm": "^4.2"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     build:
       context: php-fpm/
       args:
-        PHP_VERSION: ${PHP_VERSION:-7.3}
+        PHP_VERSION: ${PHP_VERSION:-8.0}
     volumes:
       - .:/var/www/html
     environment:
@@ -26,7 +26,7 @@ services:
     build:
       context: php-fpm/
       args:
-        PHP_VERSION: ${PHP_VERSION:-7.3}
+        PHP_VERSION: ${PHP_VERSION:-8.0}
     volumes:
       - .:/var/www/html
     environment:

diff --git 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.2 && \
-    pecl install apcu-5.1.19 && \
+RUN pecl install redis-5.3.4 && \
+    pecl install apcu-5.1.21 && \
     docker-php-ext-enable redis apcu
 
 COPY www.conf /usr/local/etc/php-fpm.d/