Skip to content

Commit 251cf17

Browse files
authored
Merge pull request php-pm#527 from acasademont/php8
Add php8 support
2 parents 0686a7d + 9e8dc26 commit 251cf17

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ jobs:
1414
matrix:
1515
php-version:
1616
- "7.4"
17+
- "8.0"
1718
deps:
1819
- "normal"
1920
include:
2021
- deps: "low"
21-
php-version: "7.1"
22+
php-version: "7.3"
2223

2324
steps:
2425
- name: "Checkout"
@@ -50,16 +51,17 @@ jobs:
5051
run: "composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-lowest"
5152
if: "${{ matrix.deps == 'low' }}"
5253

54+
# Ignore CS for PHP8 until https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4702 is merged
5355
- name: "Run git-phpcs (for pull request)"
54-
if: "${{ github.event_name == 'pull_request' }}"
56+
if: "${{ github.event_name == 'pull_request' && matrix.php-version != '8.0' }}"
5557
run: |
56-
CHANGED_PHP_FILES=$(git diff origin/$GITHUB_BASE_REF --name-only --diff-filter=ACMRTUXB | grep -E "\.php$")
58+
CHANGED_PHP_FILES=$(git diff origin/$GITHUB_BASE_REF --name-only --diff-filter=ACMRTUXB | grep -E "\.php$" || [[ $? == 1 ]])
5759
php vendor/bin/php-cs-fixer fix --config=.php_cs.php --dry-run --diff -v -- $CHANGED_PHP_FILES
5860
5961
- name: "Run git-phpcs (for push)"
60-
if: "${{ github.event_name != 'pull_request' }}"
62+
if: "${{ github.event_name != 'pull_request' && matrix.php-version != '8.0' }}"
6163
run: |
62-
CHANGED_PHP_FILES=$(git diff --name-only --diff-filter=ACMRTUXB HEAD~..HEAD | grep -E "\.php$")
64+
CHANGED_PHP_FILES=$(git diff --name-only --diff-filter=ACMRTUXB HEAD~..HEAD | grep -E "\.php$" || [[ $? == 1 ]])
6365
php vendor/bin/php-cs-fixer fix --config=.php_cs.php --dry-run --diff -v -- $CHANGED_PHP_FILES
6466
6567
- name: "Run a static analysis with phpstan/phpstan"

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "PHP-PM is a process manager, supercharger and load balancer for PHP applications.",
44
"license": "MIT",
55
"require": {
6-
"php": "^7.1",
6+
"php": "^7.3 || ^8.0 ",
77
"ext-pcntl": "*",
88
"symfony/console": "^3.4|^4|^5",
99
"symfony/error-handler": "^4.4|^5",
@@ -21,7 +21,7 @@
2121
},
2222
"require-dev": {
2323
"mockery/mockery": "^1.0",
24-
"phpunit/phpunit": "^7.0",
24+
"phpunit/phpunit": "^9.4",
2525
"friendsofphp/php-cs-fixer": "^2.16.7",
2626
"phpstan/phpstan": "^0.12.58",
2727
"drew/debug-statements-fixers": "^0.5.0"

0 commit comments

Comments
 (0)