Skip to content

Commit 609c604

Browse files
authored
Merge pull request hybridauth#1263 from szepeviktor/patch-1
Upgrade Travis configuration
2 parents f721c88 + a2d8f60 commit 609c604

File tree

2 files changed

+32
-12
lines changed

2 files changed

+32
-12
lines changed

.travis.yml

+29-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,39 @@
1-
language: php
1+
# TravisCI configuration for hybridauth/hybridauth
2+
3+
language: "php"
4+
os:
5+
- "linux"
6+
dist: "bionic"
27

38
php:
4-
- 7.2
5-
- 7.3
9+
- "7.4"
10+
- "7.3"
11+
- "7.2"
12+
13+
jobs:
14+
include:
15+
- name: "PHP 5.6"
16+
dist: "xenial"
17+
php: "5.6"
18+
# "php": ">=5.4.0"
19+
- name: "PHP 5.4"
20+
dist: "trusty"
21+
php: "5.4"
622

7-
env:
8-
- PHPCS=1 PHPUNIT=1
23+
cache:
24+
directories:
25+
- "${HOME}/.composer/cache"
926

1027
before_script:
11-
- composer install
12-
- sh -c "if [ '$PHPCS' = '1' ]; then composer global require squizlabs/php_codesniffer=*; fi"
28+
- "composer validate --strict"
29+
30+
install:
31+
- "composer install --prefer-dist"
32+
- "composer global require squizlabs/php_codesniffer"
1333

1434
script:
15-
- sh -c "if [ '$PHPUNIT' = '1' ]; then vendor/bin/phpunit; fi"
16-
- sh -c "if [ '$PHPCS' = '1' ]; then ~/.config/composer/vendor/bin/phpcs -p --extensions=php --standard=PSR2 --ignore=./src/Thirdparty/* ./src; fi"
35+
- "vendor/bin/phpunit --verbose"
36+
- "composer global exec -- phpcs -p -s --extensions=php --standard=PSR2 --ignore='./src/Thirdparty/*' ./src"
1737

1838
notifications:
1939
email: false

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
"gitter": "https://gitter.im/hybridauth/hybridauth"
1717
},
1818
"require": {
19-
"php": ">=5.4.0",
20-
"firebase/php-jwt": "*",
19+
"php": "^5.4 || ^7.0",
20+
"firebase/php-jwt": "^4.0 || ^5.0",
2121
"phpseclib/phpseclib": "~2.0"
2222
},
2323
"require-dev": {
2424
"ext-curl": "*",
25-
"phpunit/phpunit": "^4.8.35 || ^6.5 || ^8"
25+
"phpunit/phpunit": "^4.8.35 || ^6.5 || ^8.0"
2626
},
2727
"autoload": {
2828
"psr-4": {

0 commit comments

Comments
 (0)