Merge branch '2.11' into 2

.github/workflows/ci.yml

@@ -12,5 +12,5 @@ jobs:
   ci:
     name: CI
     # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

.github/workflows/keepalive.yml

@@ -10,7 +10,7 @@ jobs:
   keepalive:
     name: Keepalive
     # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     runs-on: ubuntu-latest
     steps:
       - name: Keepalive

README.md

@@ -16,7 +16,7 @@ This includes the following core Silverstripe modules:
 You can also opt in to install the following suggested (not required) modules:
 
  * [silverstripe/textextraction](https://github.com/silverstripe/silverstripe-textextraction): Text Extraction API for
-   SilverStripe CMS (mostly used with 'fulltextsearch' module)
+   Silverstripe CMS (mostly used with 'fulltextsearch' module)
 
 This can be either added to an existing project or used as a project base for creating a Silverstripe CMS install.
 

phpunit.xml.dist

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
     <testsuite name="recipe-solr-search">
         <directory>vendor/cwp/cwp</directory>