Skip to content

Commit 0000075

Browse files
authored
Merge pull request #291 from jeremykendall/feature/support-php8
Update package configuration against PHP8 and PHPUnit and Travis
2 parents 31439c3 + 3b9606f commit 0000075

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

.travis.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,41 @@ matrix:
77
include:
88
- php: 7.2
99
env:
10-
- COLLECT_COVERAGE=false
1110
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
1211
- RUN_PHPSTAN=false
1312
- VALIDATE_CODING_STYLE=false
1413
- php: 7.2
1514
env:
16-
- COLLECT_COVERAGE=true
1715
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
18-
- RUN_PHPSTAN=true
19-
- VALIDATE_CODING_STYLE=true
16+
- RUN_PHPSTAN=false
17+
- VALIDATE_CODING_STYLE=false
2018
- php: 7.3
2119
env:
22-
- COLLECT_COVERAGE=false
2320
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
2421
- RUN_PHPSTAN=false
2522
- VALIDATE_CODING_STYLE=false
2623
- php: 7.3
2724
env:
28-
- COLLECT_COVERAGE=true
2925
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
30-
- RUN_PHPSTAN=true
31-
- VALIDATE_CODING_STYLE=true
26+
- RUN_PHPSTAN=false
27+
- VALIDATE_CODING_STYLE=false
3228
- php: 7.4
3329
env:
34-
- COLLECT_COVERAGE=false
3530
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
3631
- RUN_PHPSTAN=false
3732
- VALIDATE_CODING_STYLE=false
3833
- php: 7.4
3934
env:
40-
- COLLECT_COVERAGE=true
4135
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
4236
- RUN_PHPSTAN=true
4337
- VALIDATE_CODING_STYLE=true
4438
- php: nightly
4539
env:
46-
- COLLECT_COVERAGE=false
4740
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
4841
- RUN_PHPSTAN=false
4942
- VALIDATE_CODING_STYLE=false
5043
install:
5144
- composer remove --no-interaction --no-update --dev "friendsofphp/php-cs-fixer"
52-
- travis_retry composer require $COMPOSER_ARGS --no-update --dev "composer/composer:2.0.x-dev"
53-
- travis_retry composer require $COMPOSER_ARGS --no-update --dev "phpunit/phpunit:^9.3.11"
5445
- travis_retry composer update $COMPOSER_ARGS
5546
allow_failures:
5647
- php: nightly
@@ -62,4 +53,4 @@ install:
6253
script:
6354
- if [ "$VALIDATE_CODING_STYLE" == "true" ]; then composer phpcs; fi
6455
- if [ "$RUN_PHPSTAN" == "true" ]; then composer phpstan; fi
65-
- composer run-script phpunit
56+
- composer phpunit

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
"psr/simple-cache": "^1.0.1"
5151
},
5252
"require-dev": {
53-
"composer/composer": "^1.6",
53+
"composer/composer": "^1.6 || ^2.0",
5454
"friendsofphp/php-cs-fixer": "^2.16",
5555
"mikey179/vfsstream": "^1.6.7",
5656
"phpstan/phpstan": "^0.12",
5757
"phpstan/phpstan-phpunit": "^0.12",
5858
"phpstan/phpstan-strict-rules": "^0.12",
59-
"phpunit/phpunit": "^8.0"
59+
"phpunit/phpunit": "^8.0 || ^9.3"
6060
},
6161
"suggest": {
6262
"psr/simple-cache-implementation": "To enable using other cache providers",

0 commit comments

Comments
 (0)