DEP PHP Support in CMS5

silverstripe · Jan 13, 2023 · d9da854 · d9da854
1 parent d666c4f
commit d9da854
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/_config.php b/_config.php
diff --git a/composer.json b/composer.json
@@ -21,19 +21,19 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
-        "silverstripe/framework": "^4.10",
-        "monolog/monolog": "~1.15",
+        "php": "^8.1",
+        "silverstripe/framework": "^5",
+        "monolog/monolog": "^3.2",
         "silverstripe/solr-php-client": "^1.0",
-        "symfony/process": "^3.4 || ^4",
+        "symfony/process": "^6.2",
         "tractorcow/silverstripe-proxy-db": "^1",
         "ext-curl": "*"
     },
     "require-dev": {
-        "silverstripe/cms": "^4.0",
+        "silverstripe/cms": "^5",
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.0",
-        "symbiote/silverstripe-queuedjobs": "^4.9"
+        "squizlabs/php_codesniffer": "^3",
+        "symbiote/silverstripe-queuedjobs": "^5"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Utils/Logging/QueuedJobLogHandler.php b/src/Utils/Logging/QueuedJobLogHandler.php
@@ -3,6 +3,7 @@
 namespace SilverStripe\FullTextSearch\Utils\Logging;
 
 use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\LogRecord;
 use Monolog\Logger;
 use Symbiote\QueuedJobs\Services\QueuedJob;
 
@@ -53,7 +54,7 @@ public function getQueuedJob()
         return $this->queuedJob;
     }
 
-    protected function write(array $record)
+    protected function write(LogRecord $record): void
     {
         // Write formatted message
         $this->getQueuedJob()->addMessage($record['formatted']);

diff --git a/tests/SolrReindexTest/SolrReindexTest_Handler.php b/tests/SolrReindexTest/SolrReindexTest_Handler.php
@@ -3,6 +3,7 @@
 namespace SilverStripe\FullTextSearch\Tests\SolrReindexTest;
 
 use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\LogRecord;
 use SilverStripe\Dev\TestOnly;
 
 /**
@@ -32,7 +33,7 @@ public function clear()
         $this->messages = array();
     }
 
-    protected function write(array $record)
+    protected function write(LogRecord $record): void
     {
         $this->messages[] = $record['message'];
     }