From 0c1280b6b0101d1d044a57486e575c7f030ab427 Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Wed, 26 Feb 2020 14:53:42 +1300 Subject: [PATCH 1/2] Update Travis config to include PHP 7.4 build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4ede93..92a98b7 100644 --- 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: From 101c69a27ed52545d20e51be98f4672d309fc7be Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Wed, 26 Feb 2020 16:47:49 +1300 Subject: [PATCH 2/2] Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9c65bba..399e73a 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,8 @@ "silverstripe/versioned": "1.5.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" -} \ No newline at end of file +}