From ef2201f1fe49a0fb8628e34ac09d89d035f860fe Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 5 Nov 2021 09:47:39 +1300 Subject: [PATCH] API phpunit 9 support --- composer.json | 5 ++--- phpunit.xml.dist | 28 +++++++++++++++------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 02a4572..b307256 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "homepage": "http://silverstripe.org", "license": "BSD-3-Clause", "require": { - "php": "^7.1 || ^8", + "php": "^7.3 || ^8.0", "silverstripe/recipe-plugin": "^1.5", "silverstripe/recipe-core": "4.x-dev", "silverstripe/admin": "1.x-dev", @@ -21,8 +21,7 @@ "silverstripe/session-manager": "1.x-dev" }, "require-dev": { - "sminnee/phpunit": "^5.7", - "sminnee/phpunit-mock-objects": "^3.4.5" + "phpunit/phpunit": "^9.5" }, "extra": { "project-files": [ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 64538a7..a47b42a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,15 +1,17 @@ - - vendor/silverstripe/admin/tests - vendor/silverstripe/asset-admin/tests - vendor/silverstripe/campaign-admin/tests - vendor/silverstripe/cms/tests - vendor/silverstripe/errorpage/tests - vendor/silverstripe/graphql/tests - vendor/silverstripe/reports/tests - vendor/silverstripe/session-manager/tests - vendor/silverstripe/siteconfig/tests - vendor/silverstripe/versioned/tests - vendor/silverstripe/versioned-admin/tests - + + + vendor/silverstripe/admin/tests + vendor/silverstripe/asset-admin/tests + vendor/silverstripe/campaign-admin/tests + vendor/silverstripe/cms/tests + vendor/silverstripe/errorpage/tests + vendor/silverstripe/graphql/tests + vendor/silverstripe/reports/tests + vendor/silverstripe/session-manager/tests + vendor/silverstripe/siteconfig/tests + vendor/silverstripe/versioned/tests + vendor/silverstripe/versioned-admin/tests + +