From 6110f07c0aeb71452ab5e1aaa2c35465c792937d Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Thu, 11 Nov 2021 14:39:50 +1300
Subject: [PATCH] DEP Use carets instead of dev requirements and use phpunit 9

---
 .travis.yml      |  2 +-
 composer.json    | 14 ++++++++------
 phpunit.xml.dist | 16 +++++++++-------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a51b231..58663f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,5 +5,5 @@ import:
 
 env:
   global:
-    - REQUIRE_EXTRA="silverstripe/versioned:1.x-dev"
+    - REQUIRE_EXTRA="silverstripe/versioned:^1"
     - PHPUNIT_SUITE="recipe-ccl"
diff --git a/composer.json b/composer.json
index de08619..420adfb 100644
--- a/composer.json
+++ b/composer.json
@@ -5,15 +5,17 @@
     "homepage": "https://silverstripe.org",
     "license": "BSD-3-Clause",
     "require": {
+        "php": "^7.3 || ^8.0",
         "silverstripe/recipe-plugin": "^1",
-        "silverstripe/recipe-core": "4.x-dev",
-        "cwp/cwp-core": "2.x-dev",
-        "silverstripe/auditor": "2.x-dev",
-        "silverstripe/environmentcheck": "2.x-dev",
-        "silverstripe/hybridsessions": "2.x-dev"
+        "silverstripe/recipe-core": "^4",
+        "cwp/cwp-core": "^2",
+        "silverstripe/auditor": "^2",
+        "silverstripe/environmentcheck": "^2",
+        "silverstripe/hybridsessions": "^2"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7"
+        "phpunit/phpunit": "^9.5",
+        "silverstripe/framework": "^4.10"
     },
     "extra": {
         "project-files": [
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 668f2da..d2e8a9e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,9 +1,11 @@
 <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
-    <testsuite name="recipe-ccl">
-        <directory>vendor/cwp/cwp-core/tests</directory>
-        <directory>vendor/silverstripe/auditor/tests</directory>
-        <directory>vendor/silverstripe/environmentcheck/tests</directory>
-        <directory>vendor/silverstripe/hybridsessions/tests</directory>
-        <directory>vendor/silverstripe/mimevalidator/tests</directory>
-    </testsuite>
+    <testsuites>
+        <testsuite name="recipe-ccl">
+            <directory>vendor/cwp/cwp-core/tests</directory>
+            <directory>vendor/silverstripe/auditor/tests</directory>
+            <directory>vendor/silverstripe/environmentcheck/tests</directory>
+            <directory>vendor/silverstripe/hybridsessions/tests</directory>
+            <directory>vendor/silverstripe/mimevalidator/tests</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>