Skip to content

Commit

Permalink
Merge pull request #6 from OpenBuildings/update
Browse files Browse the repository at this point in the history
Upgrade to PHPUnit 6, drop PHP 5
  • Loading branch information
hkdobrev committed Apr 22, 2017
2 parents 1ae960e + f25d428 commit ca3e4d4
Show file tree
Hide file tree
Showing 16 changed files with 1,990 additions and 202 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
/vendor/
/build/
/modules/

# Ignore local modifications
/phpunit.xml
17 changes: 8 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ language: php
sudo: false

php:
- 5.4
- 5.5
- 5.6
- 7
- 7.0
- 7.1

matrix:
fast_finish: true
allow_failures:
- php: 7

branches:
only:
- master

cache:
directories:
Expand All @@ -23,16 +23,15 @@ notifications:
secure: jkZDWqI+za7mMP1RnozFmsB6SM2THjp59elBEpMrewjG270NpCdB2fCc2XFSeHVJ1vyPax/Q139CsWhctpD4smA4An1GmTsvQyVcWVvKsqsrTG0q22cBx+WKJKL9cwxQ+UQSbvySVCY6V3oXaqmaPBK97oqHZOc+FET2Z9WDHhc=

install:
- composer selfupdate
- composer install --no-interaction
- travis_retry composer install --no-interaction --no-progress --prefer-dist

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

script:
- phpunit --coverage-clover build/logs/clover.xml
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml --coverage-text

after_script:
- wget https://scrutinizer-ci.com/ocular.phar
Expand Down
17 changes: 11 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,20 @@
}
],
"require": {
"php": ">=5.3.0",
"php": "^7",
"composer/installers": "*",
"openbuildings/purchases": "^0.9.0",
"openbuildings/shipping": "^0.10 | ^0.11"
"openbuildings/jam": "^0.5",
"openbuildings/purchases": "^0.9 | ^0.10",
"openbuildings/shipping": "^0.10 | ^0.11",
"openbuildings/jam-monetary": "^0.1.21"
},
"require-dev": {
"openbuildings/kohana-test-bootsrap": "0.1.*"
"openbuildings/kohana-test-bootstrap": "^0.2",
"kohana/auth": "^3.3",
"openbuildings/jam-auth": "^0.4.3",
"phpunit/phpunit": "^6.1"
},
"autoload": {
"psr-0": {"Openbuildings\\Promotions\\": "src/"}
"autoload-dev": {
"classmap": ["tests/classes"]
}
}
Loading

0 comments on commit ca3e4d4

Please sign in to comment.