Skip to content

Commit 4967b14

Browse files
committed
Merge branch 'master' of github.com:serbanghita/Mobile-Detect into devel
2 parents f771138 + 7c92151 commit 4967b14

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

.travis.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
1+
sudo: false
2+
dist: trusty
13
language: php
2-
php:
3-
- "5.4"
4-
- "5.5"
5-
- "5.6"
6-
- "7.0"
74

85
matrix:
96
include:
10-
- php: "5.3"
7+
- php: 5.3
118
dist: precise
9+
- php: 5.4
10+
- php: 5.5
11+
- php: 5.6
12+
- php: 7.0
13+
- php: 7.1
14+
- php: 7.2
15+
- php: nightly
16+
allow_failures:
17+
- php: nightly
18+
fast_finish: true
1219

1320
branches:
1421
only:
1522
- devel
1623
- master
1724

1825
before_script:
19-
- wget -O phpunit.phar https://phar.phpunit.de/phpunit-4.8.phar
26+
- composer install
2027

2128
script:
22-
- php phpunit.phar --version
23-
- php phpunit.phar -v -c tests/phpunit.xml
29+
- vendor/bin/phpunit --version
30+
- vendor/bin/phpunit -v -c tests/phpunit.xml
2431

2532
notifications:
2633
email:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"php": ">=5.0.0"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "*"
20+
"phpunit/phpunit": "~4.8|5.7"
2121
},
2222
"autoload": {
2323
"classmap": ["Mobile_Detect.php"],

0 commit comments

Comments
 (0)