Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add PHP 8.1 support #385

Merged
merged 1 commit into from
Nov 24, 2021
Merged

Add PHP 8.1 support #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/CI-Experimental.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
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.0.0",
"php": "~8.0.0|~8.1.0",
"ext-json": "*",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
Expand All @@ -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"
},
Expand Down
5 changes: 3 additions & 2 deletions composer.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions php-fpm/Dockerfile
View file
Open in desktop
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.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/
Expand Down