Merge branch '3.5' into 3

MNT Revert erroneous dependency changes

.github/workflows/ci.yml

@@ -4,13 +4,8 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every Saturday at 12:20pm UTC
-  schedule:
-    - cron: '20 12 * * 6'
 
 jobs:
   ci:
     name: CI
-    # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

.github/workflows/dispatch-ci.yml

@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 12:20 PM UTC, only on Saturday and Sunday
+  schedule:
+    - cron: '20 12 * * 6,0'
+
+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

.upgrade.yml

@@ -0,0 +1,14 @@
+mappings:
+  FileTextExtractable: SilverStripe\TextExtraction\Extension\FileTextExtractable
+  FileTextCache: SilverStripe\TextExtraction\Cache\FileTextCache
+  FileTextCache_Cache: SilverStripe\TextExtraction\Cache\FileTextCache\Cache
+  FileTextCache_Database: SilverStripe\TextExtraction\Cache\FileTextCache\Database
+  FileTextExtractor: SilverStripe\TextExtraction\Extractor\FileTextExtractor
+  FileTextExtractor_Exception: SilverStripe\TextExtraction\Extractor\FileTextExtractor\Exception
+  HTMLTextExtractor: SilverStripe\TextExtraction\Extractor\HTMLTextExtractor
+  PDFTextExtractor: SilverStripe\TextExtraction\Extractor\PDFTextExtractor
+  SolrCellTextExtractor: SilverStripe\TextExtraction\Extractor\SolrCellTextExtractor
+  TikaServerTextExtractor: SilverStripe\TextExtraction\Extractor\TikaServerTextExtractor
+  TikaTextExtractor: SilverStripe\TextExtraction\Extractor\TikaTextExtractor
+  TikaRestClient: SilverStripe\TextExtraction\Rest\TikaRestClient
+

composer.json

@@ -20,11 +20,11 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "silverstripe/framework": "^5",
-        "silverstripe/assets": "^2",
-        "silverstripe/versioned": "^2",
-        "guzzlehttp/guzzle": "^7.5"
+        "php": "^7.4 || ^8.0",
+        "silverstripe/framework": "^4.10",
+        "silverstripe/assets": "^1",
+        "silverstripe/versioned": "^1",
+        "guzzlehttp/guzzle": "^6.3 || ^7.0"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3",
@@ -42,4 +42,4 @@
     "extra": [],
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}