Skip to content

Commit 519a6cf

Browse files
authored
Merge pull request #49 from rpkamp/php8
Run on PHP8
2 parents 8f0cc0c + b04e8d7 commit 519a6cf

File tree

3 files changed

+6
-29
lines changed

3 files changed

+6
-29
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,8 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
php: [7.2, 7.3, 7.4]
28-
composer-flags: [""]
29-
stability: ["stable"]
30-
continue-on-composer-error: [""]
31-
include:
32-
- php: 7.2
33-
composer-flags: --prefer-lowest
34-
- php: 7.3
35-
composer-flags: --prefer-lowest
36-
- php: 7.4
37-
composer-flags: --prefer-lowest
38-
- php: 8.0
39-
stability: "dev"
40-
continue-on-composer-error: true
41-
- php: 8.0
42-
stability: "dev"
43-
composer-flags: --prefer-lowest
44-
continue-on-composer-error: true
27+
php: ["7.2", "7.3", "7.4", "8.0"]
28+
composer-flags: ["", "--prefer-lowest"]
4529

4630
env:
4731
COMPOSER_ROOT_VERSION: dev-master
@@ -54,15 +38,9 @@ jobs:
5438
with:
5539
php-version: "${{ matrix.php }}"
5640

57-
- name: Update the minimum stability
58-
if: matrix.stability == 'dev'
59-
run: composer config minimum-stability ${{ matrix.stability }}
60-
6141
- name: Install dependencies
62-
id: composer-run
63-
continue-on-error: ${{ matrix.continue-on-composer-error }}
6442
run: composer update ${{ matrix.composer-flags }}
6543

6644
- name: Run tests
67-
if: steps.composer-run.outcome == 'success' && steps.composer-run.conclusion == 'success'
6845
run: make test
46+

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ help:
33
@awk '/^#/{c=substr($$0,3);next}c&&/^[[:alpha:]][[:alnum:]_-]+:/{print substr($$1,1,index($$1,":")),c}1{c=0}' $(MAKEFILE_LIST) | column -s: -t
44

55
# Run all tests
6-
test: lint code-style unit-tests phpstan composer-require-checker
6+
test: lint code-style unit-tests phpstan #composer-require-checker
77

88
# Lint all php files
99
lint:

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"minimum-stability": "stable",
2323
"require": {
2424
"php": "^7.2 || ^8.0",
25-
"ext-json": "*",
25+
"ext-json": "*",
2626
"ext-iconv": "*",
2727
"php-http/client-implementation": "^1.0",
2828
"php-http/httplug": "^1.0|^2.0",
@@ -34,9 +34,8 @@
3434
"phpunit/phpunit": "^8.0",
3535
"php-http/curl-client": "^2.0",
3636
"swiftmailer/swiftmailer": "^6.2.3",
37-
"phpstan/phpstan": "^0.12",
37+
"phpstan/phpstan": "^0.12.64",
3838
"pdepend/pdepend": "^2.5",
39-
"maglnet/composer-require-checker": "^2.0",
4039
"nyholm/psr7": "^1.2",
4140
"doctrine/coding-standard": "^8.0",
4241
"php-parallel-lint/php-parallel-lint": "^1.2",

0 commit comments

Comments
 (0)