Merge branch 'silverstripe:3' into symfonyProcessFix

.travis.yml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   include:
-    - php: 7.3
+    - php: 7.4
       env:
         - DB=MYSQL
         - REQUIRE_INSTALLER=4.x-dev

README.md

@@ -5,7 +5,7 @@
 [![codecov](https://codecov.io/gh/silverstripe/silverstripe-fulltextsearch/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-fulltextsearch)
 [![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
 
-Adds support for fulltext search engines like Sphinx and Solr to SilverStripe CMS.
+Adds support for fulltext search engines like Sphinx and Solr to Silverstripe CMS.
 Compatible with PHP 7.2
 
 ## Important notes when upgrading to fulltextsearch 3.7.0+
@@ -86,9 +86,9 @@ it's recommended you update your implementation to call `SearchableService::isVi
 
 ## Requirements
 
-* SilverStripe 4.0+
+* Silverstripe 4.0+
 
-**Note:** For SilverStripe 3.x, please use the [2.x release line](https://github.com/silverstripe/silverstripe-fulltextsearch/tree/2).
+**Note:** For Silverstripe 3.x, please use the [2.x release line](https://github.com/silverstripe/silverstripe-fulltextsearch/tree/2).
 
 ## Documentation
 

composer.json

@@ -21,7 +21,7 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "silverstripe/framework": "^4.10",
         "monolog/monolog": "~1.15",
         "ptcinc/solr-php-client": "^1.0",