Merge branch '4.13' into 4

MNT Fix exclude node

.cow.json

@@ -1,9 +1,7 @@
 {
   "github-slug": "silverstripe/silverstripe-installer",
-  "changelog-holder": "silverstripe/framework",
-  "changelog-path": "docs/en/04_Changelogs/{stability}/{version}.md",
   "child-stability-inherit": true,
-  "dependency-constraint": "exact",
+  "dependency-constraint": "loose",
   "vendors": [
     "silverstripe"
   ],
@@ -13,21 +11,5 @@
   ],
   "exclude": [
     "silverstripe/recipe-plugin"
-  ],
-  "archives": [
-    {
-      "recipe": "silverstripe/recipe-core",
-      "files": [
-        "SilverStripe-framework-v{version}.zip",
-        "SilverStripe-framework-v{version}.tar.gz"
-      ]
-    },
-    {
-      "recipe": "silverstripe/installer",
-      "files": [
-        "SilverStripe-cms-v{version}.zip",
-        "SilverStripe-cms-v{version}.tar.gz"
-      ]
-    }
   ]
 }

.cow/changelog.md.twig

@@ -0,0 +1,79 @@
+# {{ version }}
+
+## Overview
+
+A full list of module versions included in CMS Recipe {{ version }} is provided below. We recommend referencing recipes in your dependencies, rather than individual modules, to simplify version tracking. See [Recipes](/getting_started/).
+
+<details>
+<summary>Included module versions</summary>
+
+| Module | Version |
+| ------ | ------- |
+| silverstripe/admin | x.x.x |
+| silverstripe/asset-admin | x.x.x |
+| silverstripe/assets | x.x.x |
+| silverstripe/campaign-admin | x.x.x |
+| silverstripe/cms | x.x.x |
+| silverstripe/config | x.x.x |
+| silverstripe/errorpage | x.x.x |
+| silverstripe/framework | x.x.x |
+| silverstripe/graphql | x.x.x |
+| silverstripe/login-forms | x.x.x |
+| silverstripe/mimevalidator | x.x.x |
+| silverstripe/reports | x.x.x |
+| silverstripe/siteconfig | x.x.x |
+| silverstripe/versioned | x.x.x |
+| silverstripe/versioned-admin | x.x.x |
+
+</details>
+
+{% if version.stability == 'rc' %}
+
+## Release Candidate
+
+This version of Silverstripe CMS is a **release candidate** for an upcoming stable version, and should not be applied to production websites. We encourage developers to test this version in development / testing environments and [report any issues they encounter via GitHub](/contributing/issues_and_bugs/).
+
+{% elseif version.stable %}
+
+Upgrading to Recipe {{ version }} is recommended for all sites. This upgrade can be carried out by any development team familiar with Silverstripe.
+
+## Security considerations
+
+This release includes security fixes. Please see the release announcements for more detailed
+descriptions of each. We highly encourage upgrading your project to include the latest security patches nonetheless.
+
+We have provided a high-level severity rating of the vulnerabilities below based on the CVSS score, however please note this could vary based on the specifics of each project. You can [read the severity rating definitions in the Silverstripe CMS release process](/contributing/release_process/#severity-rating).
+
+ * [CVE-0000-0000 The Issue Title](https://www.silverstripe.org/download/security-releases/CVE-0000-0000) Severity: {# Critical/ High/ Medium/ Low #}
+ * [CVE-0000-0001 The Issue Title](https://www.silverstripe.org/download/security-releases/CVE-0000-0001) Severity: {# Critical/ High/ Medium/ Low #}
+
+## New features
+
+The [release announcement](#) includes the note worthy features, but be sure to review the change log for full detail.
+
+{# other upgrade notes here #}
+
+## Known issues
+
+{#
+* [Known issue](GitHub link)
+#}
+
+### Expected test failures
+
+The following PHPUnit test failures are expected and do not represent functional issues:
+
+{#
+* List test failures here
+#}
+
+```
+...
+```
+
+
+...
+
+{% endif %}
+
+{{ logs }}

.env.example

@@ -2,8 +2,11 @@
 # https://docs.silverstripe.org/en/4/getting_started/environment_management/#core-environment-variables
 
 # DB credentials
-SS_DATABASE_CLASS="MySQLPDODatabase"
+SS_DATABASE_CLASS="MySQLDatabase"
 SS_DATABASE_SERVER="localhost"
 SS_DATABASE_USERNAME="<user>"
 SS_DATABASE_PASSWORD="<password>"
 SS_DATABASE_NAME="<database>"
+
+# WARNING: in a live environment, change this to "live" instead of dev
+SS_ENVIRONMENT_TYPE="dev"

.gitattributes

@@ -1,4 +1,6 @@
+.github export-ignore
 .cow.json export-ignore
+.cow export-ignore
 .gitattributes export-ignore
 .travis.yml export-ignore
 behat.yml export-ignore

.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  ci:
+    name: CI
+    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
+      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:^2 silverstripe/frameworktest:^0.4.2 mikey179/vfsstream:^1.6.10
+      extra_jobs: |
+        - endtoend: true
+          endtoend_suite: admin
+          endtoend_config: vendor/silverstripe/admin/behat.yml
+        - endtoend: true
+          endtoend_suite: asset-admin
+          endtoend_config: vendor/silverstripe/asset-admin/behat.yml
+        - endtoend: true
+          endtoend_suite: cms
+          endtoend_config: vendor/silverstripe/cms/behat.yml

.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

.github/workflows/keepalive.yml

@@ -0,0 +1,17 @@
+name: Keepalive
+
+on:
+  workflow_dispatch:
+  # The 8th of every month at 4:50pm UTC
+  schedule:
+    - cron: '50 16 8 * *'
+
+jobs:
+  keepalive:
+    name: Keepalive
+    # 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: Keepalive
+        uses: silverstripe/gha-keepalive@v1

.gitignore

@@ -2,5 +2,7 @@
 /.env
 /vendor/
 /themes/simple/
-/resources/
+/_resources/
-/public/resources/
+/public/_resources/
+/.graphql-generated/
+/public/_graphql/

.travis.yml

@@ -1,110 +0,0 @@
-language: php
-
-dist: trusty
-
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install chromium-chromedriver
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-addons:
-  apt:
-    packages:
-      - tidy
-
-env:
-  global:
-    - TRAVIS_NODE_VERSION="6"
-    - COMPOSER_ROOT_VERSION="4.3.x-dev"
-    - DISPLAY=":99"
-    - XVFBARGS=":99 -ac -screen 0 1024x768x16"
-    - SS_BASE_URL="http://localhost:8080/"
-    - SS_ENVIRONMENT_TYPE="dev"
-
-matrix:
-  fast_finish: true
-  include:
-    # Core php tests
-    - php: 5.6
-      env:
-        - PHPUNIT_TEST=core
-        - DB=MYSQL
-        - PDO=1
-    - php: 7.1
-      env:
-        - PHPUNIT_TEST=framework
-        - DB=MYSQL
-    - php: 7.3
-      env:
-        - PHPUNIT_TEST=core
-        - DB=PGSQL
-    # admin php tests
-    - php: 7.0
-      env:
-        - PHPUNIT_TEST=admin
-        - DB=PGSQL
-    - php: 7.2
-      env:
-        - PHPUNIT_TEST=admin
-        - DB=MYSQL
-        - PDO=1
-    # behat tests
-    - php: 7.0
-      env:
-        - BEHAT_TEST="@framework"
-        - DB=MYSQL
-    - php: 7.0
-      env:
-        - BEHAT_TEST="@cms"
-        - DB=MYSQL
-    - php: 7.0
-      env:
-        - BEHAT_TEST="@asset-admin"
-        - DB=MYSQL
-    - php: 5.6
-      env:
-        - HEALTH_TEST=1
-        - DB=MYSQL
-        - PDO=1
-
-before_script:
-# Extra $PATH
-  - export PATH=/usr/lib/chromium-browser/:$PATH
-
-# Init PHP
-  - phpenv rehash
-  - phpenv config-rm xdebug.ini || true
-  - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-
-# Install composer dependencies
-  - composer validate
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi
-  - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/recipe-testing:^1; fi;
-  - if [[ $HEALTH_TEST ]]; then composer require --no-update silverstripe/serve:^2; fi;
-  - if ! [[ $HEALTH_TEST ]]; then composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile; fi;
-  - if [[ $HEALTH_TEST ]]; then composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile --no-dev; fi;
-
-# Start behat services
-  - if [[ $BEHAT_TEST ]] || [[ $HEALTH_TEST ]]; then mkdir artifacts; fi
-  - if [[ $BEHAT_TEST ]] || [[ $HEALTH_TEST ]]; then cp composer.lock artifacts/; fi
-  - if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi
-  - if [[ $BEHAT_TEST ]]; then (chromedriver > artifacts/chromedriver.log 2>&1 &); fi
-  - if [[ $BEHAT_TEST ]] || [[ $HEALTH_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); sleep 3; fi
-
-script:
-  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit --testsuite $PHPUNIT_TEST; fi
-  - if [[ $BEHAT_TEST ]]; then vendor/bin/behat $BEHAT_TEST; fi
-  - if [[ $HEALTH_TEST ]]; then curl -vfL http://localhost:8080/dev/build?flush; fi
-  - if [[ $HEALTH_TEST ]]; then curl -vfL http://localhost:8080/admin; fi
-
-after_failure:
-  - if [[ $BEHAT_TEST ]] || [[ $HEALTH_TEST ]]; then php ./vendor/silverstripe/framework/tests/behat/travis-upload-artifacts.php --if-env ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./artifacts/; fi
-
-notifications:
-  slack:
-    on_pull_requests: false
-    rooms:
-      secure: pr4kG5tTMqZy1DLejHd1MpPulAE7FtRvTYekWrKIbQF0SkbFz+s3v9fAk2AqCr+SxfV67M3M+sL52/q6TDjeGYJJttwA60gyfH/Qrc/ToCYP3J80Ca/hsk02mya0pF8Kpjg37XP8kNzAllR162mCwYKJgFiXO6Q1eb/aVJwiqmQ=

README.md

@@ -1,11 +1,15 @@
 ## Overview
 
-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.
+[![CI](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml)
+[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
+
+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 ##
 
-See [installation on different platforms](http://doc.silverstripe.org/framework/en/installation/),
+`composer create-project silverstripe/installer my-app`
-and [installation from source](http://doc.silverstripe.org/framework/en/installation/from-source).
+
+See [Getting Started](https://docs.silverstripe.org/en/4/getting_started/) for more information.
 
 ## Bugtracker ##
 
@@ -15,11 +19,11 @@ Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/
 
 ## Development and Contribution ##
 
-If you would like to make changes to the SilverStripe core codebase, we have an extensive [guide to contributing code](http://doc.silverstripe.org/framework/en/misc/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 ##
 
- * [Changelogs](http://doc.silverstripe.org/framework/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

behat.yml

@@ -17,5 +17,5 @@ default:
       browser_name: chrome
     SilverStripe\BehatExtension\Extension:
       bootstrap_file: vendor/silverstripe/cms/tests/behat/serve-bootstrap.php
-      screenshot_path: %paths.base%/artifacts/screenshots
+      screenshot_path: '%paths.base%/artifacts/screenshots'
       retry_seconds: 4 # default is 2

composer.json

@@ -3,26 +3,34 @@
     "type": "silverstripe-recipe",
     "description": "The SilverStripe Framework Installer",
     "require": {
-        "php": ">=5.6.0",
+        "php": "^7.4 || ^8.0",
         "silverstripe/recipe-plugin": "^1.2",
-        "silverstripe/recipe-cms": "4.3.x-dev",
+        "silverstripe/recipe-cms": "4.x-dev",
-        "silverstripe-themes/simple": "~3.2.0"
+        "silverstripe-themes/simple": "~3.2.0",
+        "silverstripe/login-forms": "4.x-dev"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^9.5"
     },
     "extra": {
         "project-files": [
             "app/_config/*",
-            ".env.example"
+            ".env.example",
+            ".graphql-generated/*"
         ],
         "public-files": [
             "assets/*",
             "favicon.ico"
-        ]
+        ],
+        "resources-dir": "_resources"
     },
     "config": {
-        "process-timeout": 600
+        "process-timeout": 600,
+        "allow-plugins": {
+            "composer/installers": true,
+            "silverstripe/recipe-plugin": true,
+            "silverstripe/vendor-plugin": true
+        }
     },
     "prefer-stable": true,
     "minimum-stability": "dev"

phpcs.xml.dist

@@ -2,6 +2,8 @@
 <ruleset name="SS3">
     <description>Coding standard for SilverStripe 4.x</description>
 
+    <file>app</file>
+
     <!-- Don't sniff third party libraries -->
     <exclude-pattern>*/vendor/*</exclude-pattern>
     <exclude-pattern>*/thirdparty/*</exclude-pattern>

phpunit.xml.dist

@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 	PHPUnit configuration for SilverStripe
 
-	Requires PHPUnit 5+
+	Requires PHPUnit 9+
 
 	Usage:
 	 - "vendor/bin/phpunit": Runs all tests in all folders
@@ -18,15 +19,20 @@
 	It is safe to remove this file for normal website operation.
 -->
 <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
+    <testsuites>
         <testsuite name="Default">
-        <directory>mysite/tests</directory>
+            <directory>app/tests</directory>
             <directory>vendor/silverstripe/cms/tests/php</directory>
             <directory>vendor/silverstripe/framework/tests/php</directory>
         </testsuite>
 
-    <!-- framework only -->
+        <!-- Framework ORM tests are split up to run in parallel -->
-    <testsuite name="framework">
+        <testsuite name="framework-core">
-        <directory>vendor/silverstripe/framework/tests/php/</directory>
+            <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 -->
@@ -41,8 +47,13 @@
             <directory>vendor/silverstripe/asset-admin/tests/php/</directory>
             <directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
             <directory>vendor/silverstripe/cms/tests/</directory>
+            <directory>vendor/silverstripe/config/tests/</directory>
+            <directory>vendor/silverstripe/errorpage/tests/</directory>
             <directory>vendor/silverstripe/graphql/tests/</directory>
+            <directory>vendor/silverstripe/login-forms/tests/php/</directory>
+            <directory>vendor/silverstripe/mimevalidator/tests/</directory>
             <directory>vendor/silverstripe/reports/tests/</directory>
             <directory>vendor/silverstripe/siteconfig/tests/php/</directory>
         </testsuite>
+    </testsuites>
 </phpunit>

public/assets/.htaccess

@@ -28,7 +28,7 @@ AddHandler default-handler php phtml php3 php4 php5 inc
     RewriteCond %{REQUEST_URI} !^[^.]*\.(?i:css|js|ace|arc|arj|asf|au|avi|bmp|bz2|cab|cda|csv|dmg|doc|docx|dotx|flv|gif|gpx|gz|hqx|ico|jpeg|jpg|kml|m4a|m4v|mid|midi|mkv|mov|mp3|mp4|mpa|mpeg|mpg|ogg|ogv|pages|pcx|pdf|png|pps|ppt|pptx|potx|ra|ram|rm|rtf|sit|sitx|tar|tgz|tif|tiff|txt|wav|webm|wma|wmv|xls|xlsx|xltx|zip|zipx)$
     RewriteRule .* - [F]
 
-    # Non existant files passed to requesthandler
+    # Non-existent files passed to requesthandler
     RewriteCond %{REQUEST_URI} ^(.*)$
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule .* ../index.php [QSA]

web.config

@@ -0,0 +1,23 @@
+<!-- Routing configuration for Microsoft IIS web server -->
+<configuration>
+    <system.webServer>
+        <rewrite>
+            <rules>
+                <rule name="SilverStripe Global URLs">
+                    <match url="^(.*)$" />
+                    <conditions>
+                        <add input="{R:1}" matchType="Pattern" pattern="public(/|$)" negate="true" />
+                    </conditions>
+                    <action type="Rewrite" url="public/{R:1}" appendQueryString="true" />
+                </rule>
+                <rule name="SilverStripe Preprocessed URLs" stopProcessing="true">
+                    <match url="^(.*)$" />
+                    <conditions>
+                        <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+                    </conditions>
+                    <action type="Rewrite" url="public/index.php" appendQueryString="true" />
+                </rule>
+            </rules>
+        </rewrite>
+    </system.webServer>
+</configuration>