Merge branch '4.11' into 4

.travis.yml

@@ -1,44 +0,0 @@
-version: ~> 1.0
-
-import:
-  - silverstripe/silverstripe-travis-shared:config/provision/standard.yml
-
-# Using a manual matrix to exlude PHPUNIT_COVERAGE_TEST for now because it was causing some strange issues
-# e.g. https://travis-ci.com/github/silverstripe/silverstripe-framework/jobs/457096837
-jobs:
-  fast_finish: true
-  include:
-    - php: 7.4
-      env:
-        - DB=MYSQL
-        - REQUIRE_INSTALLER="$REQUIRE_RECIPE"
-        - PHPCS_TEST=1
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="framework"
-        - COMPOSER_INSTALL_ARG="--prefer-lowest"
-    - php: 7.4
-      env:
-        - DB=PGSQL
-        - REQUIRE_INSTALLER="$REQUIRE_RECIPE"
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="framework"
-    - php: 7.4
-      env:
-        - DB=MYSQL
-        - REQUIRE_INSTALLER="$REQUIRE_RECIPE"
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="cms"
-    - php: 8.0
-      env:
-        - DB=MYSQL
-        - REQUIRE_INSTALLER="$REQUIRE_RECIPE"
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="framework"
-    - php: 8.1.0
-      env:
-        - DB=MYSQL
-        - REQUIRE_INSTALLER="$REQUIRE_RECIPE"
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="framework"
-  allow_failures:
-    - php: 8.1.0