Merge branch '4.5' into 4

2020-03-03 15:17:36 +13:00 · 2020-03-03 15:17:36 +13:00 · ed4c1ecd45
parent 7ceaab5e8d 5da0c5deb1
commit ed4c1ecd45
2 changed files with 4 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -18,7 +18,7 @@ matrix:
      env: DB=PGSQL
    - php: 7.3
      env: DB=MYSQL
-    - php: 7.3
+    - php: 7.4
      env: DB=MYSQL

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