Skip to content

Commit

Permalink
Merge pull request #5 from adrian-stein/master
Browse files Browse the repository at this point in the history
  • Loading branch information
dhensby committed Dec 11, 2017
2 parents 8b99b65 + 1f30fce commit 2fb0d28
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

sudo: false

dist: precise

language: php

php:
Expand All @@ -10,16 +12,16 @@ php:
- 5.5
- 5.6
env:
- DB=MYSQL CORE_RELEASE=3.2
- DB=MYSQL CORE_RELEASE=3.6

matrix:
include:
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.1
env: DB=MYSQL CORE_RELEASE=3.4
- php: 5.6
env: DB=PGSQL CORE_RELEASE=3.3
env: DB=PGSQL CORE_RELEASE=3.5

before_script:
- composer self-update || true
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"description": "SilverStripe module to allow you to masquerade as other users",
"type": "silverstripe-module",
"require": {
"php": ">=5.3.3,<7",
"php": "^5.3.3 || ^7",
"silverstripe/framework": "^3.1.0"
},
"require-dev": {
"phpunit/phpunit": "~3.7"
"phpunit/phpunit": "^3 || ^4 || ^5"
},
"license": "ISC",
"authors": [
Expand Down

0 comments on commit 2fb0d28

Please sign in to comment.