Merge branch '4.5' into 4

.cow/changelog.md.twig

@@ -4,9 +4,19 @@
 
 - 
 
+{% 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.
+
+{% elseif version.stable %}
+
 ## Upgrading {{ '{#upgrading}' }}
 
 ...
 
+{% endif %}
+
 {{ logs }}
 

.travis.yml

@@ -42,6 +42,10 @@ matrix:
       env:
         - PHPUNIT_TEST=core
         - DB=PGSQL
+    - php: 7.4
+      env:
+        - PHPUNIT_TEST=core
+        - DB=MYSQL
     # admin php tests
     - php: 7.1
       env:
@@ -52,6 +56,10 @@ matrix:
         - PHPUNIT_TEST=admin
         - DB=MYSQL
         - PDO=1
+    - php: 7.4
+      env:
+        - PHPUNIT_TEST=admin
+        - DB=MYSQL
     # behat tests
     - php: 7.1
       env:
@@ -66,6 +74,10 @@ matrix:
         - BEHAT_TEST="@asset-admin"
         - DB=MYSQL
     - php: 7.3
+      env:
+        - HEALTH_TEST=1
+        - DB=PGSQL
+    - php: 7.4
       env:
         - HEALTH_TEST=1
         - DB=MYSQL

README.md

@@ -4,8 +4,9 @@ Base project folder for a SilverStripe ([http://silverstripe.org](http://silvers
 
 ## Installation ##
 
-See [installation on different platforms](http://doc.silverstripe.org/framework/en/installation/),
-and [installation from source](http://doc.silverstripe.org/framework/en/installation/from-source).
+`composer create-project silverstripe/installer my-app`
+
+See [Getting Started](https://docs.silverstripe.org/en/4/getting_started/) for more information.
 
 ## Bugtracker ##
 
@@ -15,11 +16,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)

composer.json

@@ -10,7 +10,8 @@
         "silverstripe/login-forms": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.7",
+        "sminnee/phpunit-mock-objects": "^3.4.5"
     },
     "extra": {
         "project-files": [