tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.5' into 3.6

This commit is contained in:
Daniel Hensby 2018-01-16 12:01:55 +00:00
parent e8fef7ebdd 6ac1dea913
commit 5ddb796d15
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -12,14 +12,14 @@ php:
- 5.5 - 5.5
env: env:
- DB=MYSQL CORE_RELEASE=3.5 - DB=MYSQL CORE_RELEASE=3.6
matrix: matrix:
include: include:
- php: 5.6 - php: 5.6
env: DB=PGSQL CORE_RELEASE=3 env: DB=PGSQL CORE_RELEASE=3
- php: 5.6 - php: 5.6
env: DB=PGSQL CORE_RELEASE=3.4 env: DB=PGSQL CORE_RELEASE=3.6
- php: 7.1 - php: 7.1
env: DB=MYSQL CORE_RELEASE=3.6 env: DB=MYSQL CORE_RELEASE=3.6

5
composer.json
View File

@ -25,6 +25,9 @@
} }
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "~3.7" "phpunit/phpunit": "^3 || ^4 || ^5"
},
"autoload": {
"classmap": ["code"]
} }
} }