Skip to content

Commit

Permalink
Support PHP 8.0 (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
Yozhef authored Jan 18, 2021
1 parent 5ea347b commit b18cb03
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
- '7.2'
- '7.3'
- '7.4'
- '8.0'

name: PHP ${{ matrix.php }}
steps:
Expand Down
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ php:
- '7.0'
- '7.1'
- '7.2'
- nightly
- '7.3'
- '7.4'
- '8.0'

matrix:
fast_finish: true
Expand All @@ -26,6 +28,7 @@ cache:
- "$HOME/.composer/cache"

before_install:
- composer self-update --1
- |
if [ "$TRAVIS_PHP_VERSION" = "nightly" ]; then
COMPOSER_FLAGS="$COMPOSER_FLAGS --ignore-platform-reqs"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ help:
##---------------------------------------------------------------------------

test: ## Run all the tests
test: vendor fixtures/vendor fixtures/vendor-bin/stub/vendor
test: vendor fixtures/vendor fixtures/vendor-bin/sub/vendor
composer validate --no-interaction

php tests/root.php > root.actual
Expand All @@ -34,5 +34,5 @@ vendor:
fixtures/vendor:
composer update --working-dir fixtures --no-interaction ${COMPOSER_FLAGS}

fixtures/vendor-bin/stub/vendor:
fixtures/vendor-bin/sub/vendor:
composer update --working-dir fixtures/vendor-bin/sub --no-interaction ${COMPOSER_FLAGS}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
},
"require": {
"php": "^5.4 || ^7.0",
"php": "^5.4 || ^7.0 || ^8.0",
"composer-plugin-api": "^1.0",
"wikimedia/composer-merge-plugin": "^1.3"
},
Expand Down
10 changes: 10 additions & 0 deletions fixtures/vendor-bin/sub/composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"require": {
"theofidry/composer-inheritance-plugin": "dev-master"
},
"autoload": {
"psr-4": {
"Acme\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Acme\\": "dev"
}
}
}

0 comments on commit b18cb03

Please sign in to comment.