Merge branch '5.0' into 5

.github/workflows/ci.yml

@@ -4,15 +4,10 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every day at 4:00pm UTC
-  schedule:
-    - cron: '0 16 * * *'
 
 jobs:
   ci:
     name: CI
-    # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
     with:
       # installer contains a sample behat.yml file, though there are no behat tests to run

.github/workflows/dispatch-ci.yml

@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 4:00 PM and 5:00 PM
+  schedule:
+    - cron: '0 16,17 * * *'
+
+jobs:
+  dispatch-ci:
+    name: Dispatch CI
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch CI
+        uses: silverstripe/gha-dispatch-ci@v1

README.md

@@ -5,25 +5,27 @@
 
 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
 
-`composer create-project silverstripe/installer my-app`
+```sh
+composer create-project silverstripe/installer my-app
+```
 
-See [Getting Started](https://docs.silverstripe.org/en/4/getting_started/) for more information.
+See [Getting Started](https://docs.silverstripe.org/en/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/4/contributing/issues_and_bugs/).
+Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/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/4/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/contributing/code/).
 
-## Links ##
+## Links
 
- * [Changelogs](https://docs.silverstripe.org/en/4/changelogs/)
+ * [Changelogs](https://docs.silverstripe.org/en/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

@@ -1,26 +0,0 @@
-# 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

composer.json

@@ -4,11 +4,11 @@
     "description": "The SilverStripe Framework Installer",
     "require": {
         "php": "^8.1",
-        "silverstripe/recipe-plugin": "^2",
-        "silverstripe/vendor-plugin": "^2",
-        "silverstripe/recipe-cms": "5.x-dev",
+        "silverstripe/recipe-plugin": "2.0.x-dev",
+        "silverstripe/vendor-plugin": "2.0.x-dev",
+        "silverstripe/recipe-cms": "5.0.x-dev",
         "silverstripe-themes/simple": "~3.2.0",
-        "silverstripe/login-forms": "5.x-dev"
+        "silverstripe/login-forms": "5.0.x-dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
@@ -18,7 +18,6 @@
             "app/_config/*",
             ".env.example",
             ".graphql-generated/*"
-
         ],
         "public-files": [
             "assets/*",
@@ -35,4 +34,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}