Merge branch '5.1' into 5

emteknetnz · Oct 16, 2023 · e86725d · e86725d
2 parents 57d1b43 + afdcf82
commit e86725d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -4,11 +4,11 @@
     "description": "The SilverStripe Framework Installer",
     "require": {
         "php": "^8.1",
-        "silverstripe/recipe-plugin": "2.x-dev",
-        "silverstripe/vendor-plugin": "2.x-dev",
-        "silverstripe/recipe-cms": "5.x-dev",
-        "silverstripe-themes/simple": "~3.2.0",
-        "silverstripe/login-forms": "5.x-dev"
+        "silverstripe/recipe-plugin": "2.0.x-dev",
+        "silverstripe/vendor-plugin": "2.0.x-dev",
+        "silverstripe/recipe-cms": "5.1.x-dev",
+        "silverstripe-themes/simple": "3.3.x-dev",
+        "silverstripe/login-forms": "5.1.x-dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6"
@@ -34,4 +34,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -29,9 +29,7 @@
         <!-- Framework ORM tests are split up to run in parallel -->
         <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="framework-orm">
             <directory>vendor/silverstripe/framework/tests/php/ORM</directory>

diff --git a/public/favicon.ico b/public/favicon.ico