Merge branch '4.13' into 4

MNT Fix exclude node

.cow.json

@@ -1,10 +1,7 @@
 {
   "github-slug": "silverstripe/silverstripe-installer",
-  "changelog-holder": "silverstripe/framework",
-  "changelog-path": "docs/en/04_Changelogs/{stability}/{version}.md",
-  "changelog-template": ".cow/changelog.md.twig",
   "child-stability-inherit": true,
-  "dependency-constraint": "exact",
+  "dependency-constraint": "loose",
   "vendors": [
     "silverstripe"
   ],

.cow/changelog.md.twig

@@ -18,6 +18,7 @@ A full list of module versions included in CMS Recipe {{ version }} is provided
 | 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 |

.env.example

@@ -8,5 +8,5 @@ SS_DATABASE_USERNAME="<user>"
 SS_DATABASE_PASSWORD="<password>"
 SS_DATABASE_NAME="<database>"
 
-# WARNING: in a live environent, change this to "live" instead of dev
+# WARNING: in a live environment, change this to "live" instead of dev
 SS_ENVIRONMENT_TYPE="dev"

.gitattributes

@@ -1,3 +1,4 @@
+.github export-ignore
 .cow.json export-ignore
 .cow export-ignore
 .gitattributes 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

@@ -4,3 +4,5 @@
 /themes/simple/
 /_resources/
 /public/_resources/
+/.graphql-generated/
+/public/_graphql/

.travis.yml

@@ -1,84 +0,0 @@
-version: ~> 1.0
-
-import:
-  - silverstripe/silverstripe-travis-shared:config/provision/self.yml
-
-env:
-  global:
-    - REQUIRE_RECIPE_TESTING="^1"
-    - REQUIRE_FRAMEWORKTEST="0.2.0"
-
-matrix:
-  fast_finish: true
-  include:
-    # Core php tests
-    - php: 7.1
-      env:
-        - DB=MYSQL
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="core"
-        - PDO=1
-        - COMPOSER_ARG=--prefer-lowest
-    - php: 7.2
-      env:
-        - DB=MYSQL
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="framework"
-    - php: 7.3
-      env:
-        - DB=PGSQL
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="core"
-    - php: 7.4
-      env:
-        - DB=MYSQL
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="core"
-    - php: nightly
-      env:
-        - DB=MYSQL
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="core"
-        - COMPOSER_ARG=--ignore-platform-reqs
-    # admin php tests
-    - php: 7.1
-      env:
-        - DB=MYSQL
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="admin"
-        - PDO=1
-        - COMPOSER_ARG=--prefer-lowest
-    - php: 7.2
-      env:
-        - DB=PGSQL
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="admin"
-    - php: 7.4
-      env:
-        - DB=MYSQL
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="admin"
-    - php: nightly
-      env:
-        - DB=MYSQL
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="admin"
-        - COMPOSER_ARG=--ignore-platform-reqs
-    # behat tests
-    - php: 7.1
-      env:
-        - DB=MYSQL
-        - BEHAT_TEST=1
-        - BEHAT_SUITE="framework"
-    - php: 7.2
-      env:
-        - DB=MYSQL
-        - BEHAT_TEST=1
-        - BEHAT_SUITE="cms"
-    - php: 7.4
-      env:
-        - DB=MYSQL
-        - BEHAT_TEST=1
-        - BEHAT_SUITE="asset-admin"
-  allow_failures:
-    - php: nightly

README.md

@@ -1,6 +1,9 @@
 ## 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 ##
 
@@ -16,7 +19,7 @@ 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](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/4/contributing/code/).
 
 ## Links ##
 

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,20 +3,20 @@
     "type": "silverstripe-recipe",
     "description": "The SilverStripe Framework Installer",
     "require": {
-        "php": "^7.1 || ^8",
+        "php": "^7.4 || ^8.0",
         "silverstripe/recipe-plugin": "^1.2",
-        "silverstripe/recipe-cms": "4.7.x-dev",
+        "silverstripe/recipe-cms": "4.x-dev",
         "silverstripe-themes/simple": "~3.2.0",
-        "silverstripe/login-forms": "4.3.x-dev"
+        "silverstripe/login-forms": "4.x-dev"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
-        "sminnee/phpunit-mock-objects": "^3.4.5"
+        "phpunit/phpunit": "^9.5"
     },
     "extra": {
         "project-files": [
             "app/_config/*",
-            ".env.example"
+            ".env.example",
+            ".graphql-generated/*"
         ],
         "public-files": [
             "assets/*",
@@ -25,8 +25,13 @@
         "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"
-}
+}

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,31 +19,41 @@
 	It is safe to remove this file for normal website operation.
 -->
 <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
-    <testsuite name="Default">
-        <directory>app/tests</directory>
-        <directory>vendor/silverstripe/cms/tests/php</directory>
-        <directory>vendor/silverstripe/framework/tests/php</directory>
-    </testsuite>
+    <testsuites>
+        <testsuite name="Default">
+            <directory>app/tests</directory>
+            <directory>vendor/silverstripe/cms/tests/php</directory>
+            <directory>vendor/silverstripe/framework/tests/php</directory>
+        </testsuite>
 
-    <!-- framework only -->
-    <testsuite name="framework">
-        <directory>vendor/silverstripe/framework/tests/php/</directory>
-    </testsuite>
+        <!-- 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 -->
-    <testsuite name="core">
-        <directory>vendor/silverstripe/assets/tests/php/</directory>
-        <directory>vendor/silverstripe/versioned/tests/php/</directory>
-    </testsuite>
+        <!-- other core components -->
+        <testsuite name="core">
+            <directory>vendor/silverstripe/assets/tests/php/</directory>
+            <directory>vendor/silverstripe/versioned/tests/php/</directory>
+        </testsuite>
 
-    <!-- admin components -->
-    <testsuite name="admin">
-        <directory>vendor/silverstripe/admin/tests/php/</directory>
-        <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/graphql/tests/</directory>
-        <directory>vendor/silverstripe/reports/tests/</directory>
-        <directory>vendor/silverstripe/siteconfig/tests/php/</directory>
-    </testsuite>
+        <!-- admin components -->
+        <testsuite name="admin">
+            <directory>vendor/silverstripe/admin/tests/php/</directory>
+            <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>