Merge branch '4.13' into 4

MNT Fix exclude node

.cow.json

@@ -3,8 +3,7 @@
   "child-stability-inherit": true,
   "dependency-constraint": "loose",
   "vendors": [
-    "silverstripe",
-    "silverstripe-themes"
+    "silverstripe"
   ],
   "tests": [
     "vendor/bin/phpunit vendor/silverstripe/framework/tests/php",

.env.example

@@ -1,5 +1,5 @@
 # For a complete list of core environment variables see
-# https://docs.silverstripe.org/en/5/getting_started/environment_management/#core-environment-variables
+# https://docs.silverstripe.org/en/4/getting_started/environment_management/#core-environment-variables
 
 # DB credentials
 SS_DATABASE_CLASS="MySQLDatabase"

.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

.github/workflows/keepalive.yml

@@ -1,10 +1,10 @@
 name: Keepalive
 
 on:
-  # At 1:05 PM UTC, on day 22 of the month
-  schedule:
-    - cron: '5 13 22 * *'
   workflow_dispatch:
+  # The 8th of every month at 4:50pm UTC
+  schedule:
+    - cron: '50 16 8 * *'
 
 jobs:
   keepalive:

.htaccess

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

CONTRIBUTING.md

@@ -9,7 +9,7 @@ Please read our [issue reporting guidelines](http://doc.silverstripe.org/framewo
 
 ## Development and Contribution ##
 
-For submitting patches, please read our [guide to contributing code](https://docs.silverstripe.org/en/5/contributing/code/). We only accept pull requests on github.com.
+For submitting patches, please read our [guide to contributing code](http://doc.silverstripe.org/framework/en/misc/contributing/code). We only accept pull requests on github.com.
 
 ## Links ##
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2017, Silverstripe Limited - www.silverstripe.com
+Copyright (c) 2007-2017, SilverStripe Limited - www.silverstripe.com
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -6,7 +6,7 @@ Redistribution and use in source and binary forms, with or without modification,
     * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of Silverstripe nor the names of its contributors may be used to endorse or promote products derived from this software
+    * Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote products derived from this software
       without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

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,15 +3,14 @@
     "type": "silverstripe-recipe",
     "description": "The SilverStripe Framework Installer",
     "require": {
-        "php": "^8.1",
-        "silverstripe/recipe-plugin": "~2.0.0@stable",
-        "silverstripe/vendor-plugin": "~2.0.1@stable",
-        "silverstripe/recipe-cms": "~5.1.0@beta",
-        "silverstripe-themes/simple": "~3.3.0@stable",
-        "silverstripe/login-forms": "~5.1.0@beta"
+        "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": "4.x-dev"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6"
+        "phpunit/phpunit": "^9.5"
     },
     "extra": {
         "project-files": [
@@ -22,7 +21,8 @@
         "public-files": [
             "assets/*",
             "favicon.ico"
-        ]
+        ],
+        "resources-dir": "_resources"
     },
     "config": {
         "process-timeout": 600,

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>