Skip to content

Commit a8fec93

Browse files
authored
Merge pull request #739 from noplanman/update_travis_tests
Use trusty to enable HHVM and add PHP 7.2 to the mix.
2 parents 9cb761e + 63dd9be commit a8fec93

File tree

5 files changed

+96
-115
lines changed

5 files changed

+96
-115
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dist: xenial
1+
dist: trusty
22
sudo: required
33
language: php
44

@@ -14,6 +14,7 @@ php:
1414
- 5.6
1515
- 7.0
1616
- 7.1
17+
- 7.2
1718
- nightly
1819
- hhvm
1920

@@ -42,7 +43,7 @@ before_script:
4243

4344
script:
4445
- composer check-code
45-
- if [ "$TRAVIS_PHP_VERSION" == "7.1" ] ; then composer test-cov; else composer test; fi
46+
- if [ "$TRAVIS_PHP_VERSION" == "7.2" ] ; then composer test-cov; else composer test; fi
4647

4748
after_script:
48-
- if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then composer test-cov-upload; fi
49+
- if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then composer test-cov-upload; fi

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
66
## [Unreleased]
77
### Added
88
### Changed
9+
- Updated Travis to use Trusty containers (for HHVM) and add PHP 7.2 to the tests.
910
- Add debug log entry instead of throwing an exception for duplicate updates.
1011
### Deprecated
1112
### Removed
1213
### Fixed
14+
- PHPCS fixes for updated CodeSniffer dependency.
1315
### Security
1416

1517
## [0.52.0] - 2018-01-07

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
"ext-pdo": "*",
2323
"ext-curl": "*",
2424
"ext-mbstring": "*",
25-
"monolog/monolog": "^1.22",
26-
"guzzlehttp/guzzle": "^6.2"
25+
"monolog/monolog": "^1.23",
26+
"guzzlehttp/guzzle": "^6.3"
2727
},
2828
"require-dev": {
29-
"phpunit/phpunit": "^4.8|^5.7|^6.1",
30-
"squizlabs/php_codesniffer": "^2.8"
29+
"phpunit/phpunit": "^4.8|^5.7|^6.5",
30+
"squizlabs/php_codesniffer": "^3.2"
3131
},
3232
"autoload": {
3333
"psr-4": {

0 commit comments

Comments
 (0)