Merge branch '4.5' into 4
This commit is contained in:
commit
ed4c1ecd45
|
@ -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:
|
||||||
|
|
|
@ -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"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue