tonyair/recipe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/recipe-cms.git synced 2024-10-22 08:05:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.5' into 4

Browse Source
This commit is contained in:
Garion Herman 2020-03-03 15:17:36 +13:00
commit ed4c1ecd45
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -18,7 +18,7 @@ matrix:
env: DB=PGSQL env: DB=PGSQL
- php: 7.3 - php: 7.3
env: DB=MYSQL env: DB=MYSQL
- php: 7.3 - php: 7.4
env: DB=MYSQL env: DB=MYSQL
before_script: before_script:

5
composer.json
View File

@ -19,7 +19,8 @@
"silverstripe/versioned": "1.x-dev" "silverstripe/versioned": "1.x-dev"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7" "phpunit/phpunit": "^5.7",
"sminnee/phpunit-mock-objects": "^3.4.5"
}, },
"extra": { "extra": {
"project-files": [ "project-files": [
@ -32,4 +33,4 @@
}, },
"prefer-stable": true, "prefer-stable": true,
"minimum-stability": "dev" "minimum-stability": "dev"
} }