Merge branch '4.13' into 4

MNT Fix exclude node

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       endtoend: false
       # require the following in ci.yml rather than composer.json require-dev specifically for installer because unlike
       # regular modules, require-dev will get installed to projects during `composer create-project silverstripe/installer`
-      composer_require_extra: silverstripe/recipe-testing:^3 silverstripe/frameworktest:^1 mikey179/vfsstream:^1.6.10
+      composer_require_extra: silverstripe/recipe-testing:^2 silverstripe/frameworktest:^0.4.2 mikey179/vfsstream:^1.6.10
       extra_jobs: |
         - endtoend: true
           endtoend_suite: admin

.htaccess

@@ -0,0 +1,2 @@
+RewriteEngine On
+RewriteRule ^(.*)$ public/$1

README.md

@@ -5,27 +5,25 @@
 
 Base project folder for a Silverstripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme.
 
-## Installation
+## Installation ##
 
-```sh
-composer create-project silverstripe/installer my-app
-```
+`composer create-project silverstripe/installer my-app`
 
-See [Getting Started](https://docs.silverstripe.org/en/getting_started/) for more information.
+See [Getting Started](https://docs.silverstripe.org/en/4/getting_started/) for more information.
 
-## Bugtracker
+## Bugtracker ##
 
 Bugs are tracked on github.com ([framework issues](https://github.com/silverstripe/silverstripe-framework/issues),
 [cms issues](https://github.com/silverstripe/silverstripe-cms/issues)).
-Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/contributing/issues_and_bugs/).
+Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/contributing/issues_and_bugs/).
 
-## Development and Contribution
+## Development and Contribution ##
 
-If you would like to make changes to the Silverstripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/contributing/code/).
+If you would like to make changes to the Silverstripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/4/contributing/code/).
 
-## Links
+## Links ##
 
- * [Changelogs](https://docs.silverstripe.org/en/changelogs/)
+ * [Changelogs](https://docs.silverstripe.org/en/4/changelogs/)
  * [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
  * [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
  * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)

app/_config/assets.yml

@@ -0,0 +1,26 @@
+# SilverStripe 4.4 changes the way files are resolved. `silverstripe-assets` resolves files using a variety of formats
+# by default. When starting a brand new project on SilverStripe 4.4 or greater, those extra formats are not needed and
+# will slowdown file resolution requests a bit. This config removes those redundant formats.
+
+---
+Name: project-assetsflysystem
+After: '#assetsflysystem'
+---
+SilverStripe\Core\Injector\Injector:
+  # Define public resolution strategy
+  SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.public:
+    class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy
+    properties:
+      ResolutionFileIDHelpers:
+        - '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
+        - '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
+      DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
+      VersionedStage: Live
+  # Define protected resolution strategy
+  SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.protected:
+    class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy
+    properties:
+      DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
+      ResolutionFileIDHelpers:
+        - '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
+      VersionedStage: Stage

app/_config/email.yml

@@ -0,0 +1,9 @@
+# See https://docs.silverstripe.org/en/4/developer_guides/email/ for additional information about setting up email
+---
+Name: project-emailconfig
+After:
+  - '#emailconfig'
+---
+SilverStripe\Core\Injector\Injector:
+  Swift_Transport:
+    class: Swift_SendmailTransport

composer.json

@@ -3,12 +3,11 @@
     "type": "silverstripe-recipe",
     "description": "The SilverStripe Framework Installer",
     "require": {
-        "php": "^8.1",
-        "silverstripe/recipe-plugin": "~2.0.0@stable",
-        "silverstripe/vendor-plugin": "~2.0.0@stable",
-        "silverstripe/recipe-cms": "~5.0.0@stable",
+        "php": "^7.4 || ^8.0",
+        "silverstripe/recipe-plugin": "^1.2",
+        "silverstripe/recipe-cms": "4.x-dev",
         "silverstripe-themes/simple": "~3.2.0",
-        "silverstripe/login-forms": "~5.0.0@stable"
+        "silverstripe/login-forms": "4.x-dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
@@ -22,7 +21,8 @@
         "public-files": [
             "assets/*",
             "favicon.ico"
-        ]
+        ],
+        "resources-dir": "_resources"
     },
     "config": {
         "process-timeout": 600,

phpunit.xml.dist

@@ -26,9 +26,13 @@
             <directory>vendor/silverstripe/framework/tests/php</directory>
         </testsuite>
 
-        <!-- framework only -->
-        <testsuite name="framework">
-            <directory>vendor/silverstripe/framework/tests/php/</directory>
+        <!-- Framework ORM tests are split up to run in parallel -->
+        <testsuite name="framework-core">
+            <directory>vendor/silverstripe/framework/tests/php</directory>
+            <exclude>vendor/silverstripe/framework/tests/php/ORM</exclude>
+        </testsuite>
+        <testsuite name="framework-orm">
+            <directory>vendor/silverstripe/framework/tests/php/ORM</directory>
         </testsuite>
 
         <!-- other core components -->