Skip to content

Commit

Permalink
Use trusty to enable HHVM and add PHP 7.2 to the mix.
Browse files Browse the repository at this point in the history
Update composer dependencies and fix sniffed code.
  • Loading branch information
noplanman committed Jan 8, 2018
1 parent f7cac58 commit 162b541
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 115 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dist: xenial
dist: trusty
sudo: required
language: php

Expand All @@ -14,6 +14,7 @@ php:
- 5.6
- 7.0
- 7.1
- 7.2
- nightly
- hhvm

Expand Down Expand Up @@ -42,7 +43,7 @@ before_script:

script:
- composer check-code
- if [ "$TRAVIS_PHP_VERSION" == "7.1" ] ; then composer test-cov; else composer test; fi
- if [ "$TRAVIS_PHP_VERSION" == "7.2" ] ; then composer test-cov; else composer test; fi

after_script:
- if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then composer test-cov-upload; fi
- if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then composer test-cov-upload; fi
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
## [Unreleased]
### Added
### Changed
- Updated Travis to use Trusty containers (for HHVM) and add PHP 7.2 to the tests.
### Deprecated
### Removed
### Fixed
- PHPCS fixes for updated CodeSniffer dependency.
### Security

## [0.52.0] - 2018-01-07
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
"ext-pdo": "*",
"ext-curl": "*",
"ext-mbstring": "*",
"monolog/monolog": "^1.22",
"guzzlehttp/guzzle": "^6.2"
"monolog/monolog": "^1.23",
"guzzlehttp/guzzle": "^6.3"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.7|^6.1",
"squizlabs/php_codesniffer": "^2.8"
"phpunit/phpunit": "^4.8|^5.7|^6.5",
"squizlabs/php_codesniffer": "^3.2"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 162b541

Please sign in to comment.