Skip to content

Commit

Permalink
Added support for PHP 8.2 and dropped support for PHP 7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
frankvanhest committed Dec 20, 2022
1 parent 313512e commit 031f666
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [7.4, 8.0, 8.1]
php: [8.0, 8.1, 8.2]
composer-flags: [ '' ]
stability: ['prefer-lowest', 'prefer-stable']
experimental: [false]
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
}
],
"require": {
"php": "~7.4.0 | ~8.0.0 | ~8.1.0",
"nikic/php-parser": "^v4.14",
"phpstan/phpstan": "^1.7"
"php": "~8.0.0 | ~8.1.0 | ~8.2.0",
"nikic/php-parser": "^v4.15",
"phpstan/phpstan": "^1.9"
},
"require-dev": {
"infection/infection": "^0.26",
Expand Down
20 changes: 7 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
version: "3.7"
services:
php74:
build: ./docker/php74/
expose:
- 9000
volumes:
- .:/var/www/html
- ./docker/php74/conf.d/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
- ./docker/php74/conf.d/error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini

php80:
build: ./docker/php80/
expose:
- 9000
volumes:
- .:/var/www/html
- ./docker/php80/conf.d/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
- ./docker/php80/conf.d/error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini

php81:
build: ./docker/php81/
expose:
- 9000
volumes:
- .:/var/www/html
- ./docker/php81/conf.d/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
- ./docker/php81/conf.d/error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini

php82:
build: ./docker/php82/
volumes:
- .:/var/www/html
- ./docker/php82/conf.d/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
- ./docker/php82/conf.d/error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini
2 changes: 1 addition & 1 deletion docker/php74/Dockerfile → docker/php82/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.4-cli
FROM php:8.2-cli

RUN apt-get update && \
apt-get install -y --no-install-recommends git libzip-dev zip unzip \
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions run-tests.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/env sh

echo 'RUN tests in PHP 7.4'
/usr/bin/env docker-compose run php74 /var/www/html/docker/run-tests.sh

echo 'RUN tests in PHP 8.0'
/usr/bin/env docker-compose run php80 /var/www/html/docker/run-tests.sh

echo 'RUN tests in PHP 8.1'
/usr/bin/env docker-compose run php81 /var/www/html/docker/run-tests.sh

echo 'RUN tests in PHP 8.2'
/usr/bin/env docker-compose run php81 /var/www/html/docker/run-tests.sh

0 comments on commit 031f666

Please sign in to comment.