Skip to content

Commit ca3e4d4

Browse files
authored
Merge pull request #6 from OpenBuildings/update
Upgrade to PHPUnit 6, drop PHP 5
2 parents 1ae960e + f25d428 commit ca3e4d4

File tree

16 files changed

+1990
-202
lines changed

16 files changed

+1990
-202
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
/vendor/
44
/build/
55
/modules/
6+
7+
# Ignore local modifications
8+
/phpunit.xml

.travis.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ language: php
33
sudo: false
44

55
php:
6-
- 5.4
7-
- 5.5
8-
- 5.6
9-
- 7
6+
- 7.0
7+
- 7.1
108

119
matrix:
1210
fast_finish: true
13-
allow_failures:
14-
- php: 7
11+
12+
branches:
13+
only:
14+
- master
1515

1616
cache:
1717
directories:
@@ -23,16 +23,15 @@ notifications:
2323
secure: jkZDWqI+za7mMP1RnozFmsB6SM2THjp59elBEpMrewjG270NpCdB2fCc2XFSeHVJ1vyPax/Q139CsWhctpD4smA4An1GmTsvQyVcWVvKsqsrTG0q22cBx+WKJKL9cwxQ+UQSbvySVCY6V3oXaqmaPBK97oqHZOc+FET2Z9WDHhc=
2424

2525
install:
26-
- composer selfupdate
27-
- composer install --no-interaction
26+
- travis_retry composer install --no-interaction --no-progress --prefer-dist
2827

2928
before_script:
3029
- mkdir -p build/logs
3130
- mysql -e 'create database `OpenBuildings/promotions`;'
3231
- mysql --default-character-set=utf8 OpenBuildings/promotions < tests/test_data/structure.sql
3332

3433
script:
35-
- phpunit --coverage-clover build/logs/clover.xml
34+
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml --coverage-text
3635

3736
after_script:
3837
- wget https://scrutinizer-ci.com/ocular.phar

composer.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,20 @@
1818
}
1919
],
2020
"require": {
21-
"php": ">=5.3.0",
21+
"php": "^7",
2222
"composer/installers": "*",
23-
"openbuildings/purchases": "^0.9.0",
24-
"openbuildings/shipping": "^0.10 | ^0.11"
23+
"openbuildings/jam": "^0.5",
24+
"openbuildings/purchases": "^0.9 | ^0.10",
25+
"openbuildings/shipping": "^0.10 | ^0.11",
26+
"openbuildings/jam-monetary": "^0.1.21"
2527
},
2628
"require-dev": {
27-
"openbuildings/kohana-test-bootsrap": "0.1.*"
29+
"openbuildings/kohana-test-bootstrap": "^0.2",
30+
"kohana/auth": "^3.3",
31+
"openbuildings/jam-auth": "^0.4.3",
32+
"phpunit/phpunit": "^6.1"
2833
},
29-
"autoload": {
30-
"psr-0": {"Openbuildings\\Promotions\\": "src/"}
34+
"autoload-dev": {
35+
"classmap": ["tests/classes"]
3136
}
3237
}

0 commit comments

Comments
 (0)