Merge branch '5.1' into 5

emteknetnz · Oct 16, 2023 · b380d6c · b380d6c
2 parents 85c6e5a + 4b84c97
commit b380d6c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 39 deletions.
diff --git a/composer.json b/composer.json
@@ -6,41 +6,41 @@
     "license": "BSD-3-Clause",
     "require": {
         "php": "^8.1",
-        "silverstripe/recipe-plugin": "2.x-dev",
-        "silverstripe/installer": "5.x-dev",
-        "silverstripe/recipe-authoring-tools": "2.x-dev",
-        "silverstripe/recipe-blog": "2.x-dev",
-        "silverstripe/recipe-collaboration": "2.x-dev",
-        "silverstripe/recipe-form-building": "2.x-dev",
-        "silverstripe/recipe-reporting-tools": "2.x-dev",
-        "silverstripe/recipe-services": "2.x-dev",
-        "silverstripe/recipe-content-blocks": "3.x-dev",
-        "silverstripe/auditor": "3.x-dev",
-        "silverstripe/developer-docs": "5.x-dev",
-        "silverstripe/environmentcheck": "3.x-dev",
-        "silverstripe/hybridsessions": "3.x-dev",
-        "silverstripe/registry": "3.x-dev",
-        "silverstripe/totp-authenticator": "5.x-dev",
-        "silverstripe/mfa": "5.x-dev",
-        "silverstripe/crontask": "3.x-dev",
-        "silverstripe/gridfieldqueuedexport": "3.x-dev",
-        "silverstripe/ldap": "2.x-dev",
-        "silverstripe/textextraction": "4.x-dev",
-        "silverstripe/realme": "5.x-dev",
-        "silverstripe/webauthn-authenticator": "5.x-dev",
-        "silverstripe/subsites": "3.x-dev",
-        "silverstripe/lumberjack": "3.x-dev",
-        "silverstripe/staticpublishqueue": "6.x-dev",
-        "cwp/starter-theme": "4.x-dev",
-        "cwp/agency-extensions": "3.x-dev",
-        "cwp/watea-theme": "4.x-dev",
-        "dnadesign/silverstripe-elemental-userforms": "4.x-dev",
-        "symbiote/silverstripe-multivaluefield": "6.x-dev",
-        "symbiote/silverstripe-gridfieldextensions": "4.x-dev",
-        "symbiote/silverstripe-queuedjobs": "5.x-dev",
-        "colymba/gridfield-bulk-editing-tools": "4.x-dev",
-        "tractorcow/silverstripe-fluent": "7.x-dev",
-        "silverstripe/dynamodb": "5.x-dev"
+        "silverstripe/recipe-plugin": "2.0.x-dev",
+        "silverstripe/installer": "5.1.x-dev",
+        "silverstripe/recipe-authoring-tools": "2.1.x-dev",
+        "silverstripe/recipe-blog": "2.1.x-dev",
+        "silverstripe/recipe-collaboration": "2.1.x-dev",
+        "silverstripe/recipe-form-building": "2.1.x-dev",
+        "silverstripe/recipe-reporting-tools": "2.1.x-dev",
+        "silverstripe/recipe-services": "2.1.x-dev",
+        "silverstripe/recipe-content-blocks": "3.1.x-dev",
+        "silverstripe/auditor": "3.0.x-dev",
+        "silverstripe/developer-docs": "5.1.x-dev",
+        "silverstripe/environmentcheck": "3.0.x-dev",
+        "silverstripe/hybridsessions": "3.0.x-dev",
+        "silverstripe/registry": "3.1.x-dev",
+        "silverstripe/totp-authenticator": "5.1.x-dev",
+        "silverstripe/mfa": "5.1.x-dev",
+        "silverstripe/crontask": "3.0.x-dev",
+        "silverstripe/gridfieldqueuedexport": "3.1.x-dev",
+        "silverstripe/ldap": "2.1.x-dev",
+        "silverstripe/textextraction": "4.0.x-dev",
+        "silverstripe/realme": "5.2.x-dev",
+        "silverstripe/webauthn-authenticator": "5.1.x-dev",
+        "silverstripe/subsites": "3.1.x-dev",
+        "silverstripe/lumberjack": "3.0.x-dev",
+        "silverstripe/staticpublishqueue": "6.1.x-dev",
+        "cwp/starter-theme": "4.0.x-dev",
+        "cwp/agency-extensions": "3.1.x-dev",
+        "cwp/watea-theme": "4.0.x-dev",
+        "dnadesign/silverstripe-elemental-userforms": "4.1.x-dev",
+        "symbiote/silverstripe-multivaluefield": "6.0.x-dev",
+        "symbiote/silverstripe-gridfieldextensions": "4.0.x-dev",
+        "symbiote/silverstripe-queuedjobs": "5.0.x-dev",
+        "colymba/gridfield-bulk-editing-tools": "4.0.x-dev",
+        "tractorcow/silverstripe-fluent": "7.0.x-dev",
+        "silverstripe/dynamodb": "5.0.x-dev"
     },
     "require-dev": {
         "silverstripe/frameworktest": "^1",
@@ -67,4 +67,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -14,9 +14,7 @@
         </testsuite>
         <testsuite name="framework-core">
             <directory>vendor/silverstripe/framework/tests/php</directory>
-            <exclude>
-                <directory>vendor/silverstripe/framework/tests/php/ORM</directory>
-            </exclude>
+            <exclude>vendor/silverstripe/framework/tests/php/ORM</exclude>
         </testsuite>
 
         <testsuite name="recipe-cms">