DEP PHP Support in CMS5

silverstripe · Jan 16, 2023 · 2f3eb22 · 2f3eb22
1 parent 019d0e1
commit 2f3eb22
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,9 +16,10 @@ jobs:
     uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
     with:
       extra_jobs: |
-        - composer_require_extra: silverstripe/mfa:^4
+        - composer_require_extra: silverstripe/mfa:^5
           name_suffix: 'mfa'
           phpunit: true
-        - composer_require_extra: silverstripe/session-manager:^1
+        - composer_require_extra: silverstripe/session-manager:^2
           name_suffix: 'session-manager'
           phpunit: true
+        - composer_require_extra: silverstripe/subsites:^3
diff --git a/code/RealIPProcessor.php b/code/RealIPProcessor.php
@@ -2,12 +2,13 @@
 
 namespace SilverStripe\Auditor;
 
+use Monolog\LogRecord;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Core\Injector\Injector;
 
 class RealIPProcessor
 {
-    public function __invoke(array $record)
+    public function __invoke(LogRecord $record)
     {
         $req = Injector::inst()->create(HTTPRequest::class, null, null);
         $record['extra']['real_ip'] = $req->getIP();

diff --git a/composer.json b/composer.json
@@ -8,16 +8,16 @@
     ],
     "license": "BSD-3-Clause",
     "require": {
-        "php": "^7.4 || ^8.0",
-        "silverstripe/framework": "^4.12",
-        "monolog/monolog": "~1.11",
-        "psr/log": "~1.0",
-        "tractorcow/silverstripe-proxy-db": "^1"
+        "php": "^8.1",
+        "silverstripe/framework": "^5",
+        "monolog/monolog": "^3.2",
+        "psr/log": "^3",
+        "silverstripe/silverstripe-proxy-db": "^2"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.0",
-        "silverstripe/versioned": "^1.0"
+        "squizlabs/php_codesniffer": "^3",
+        "silverstripe/versioned": "^2"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/AuditHookTest/Logger.php b/tests/AuditHookTest/Logger.php
@@ -9,7 +9,7 @@ class Logger extends AbstractLogger implements TestOnly
 {
     protected $messages = [];
 
-    public function log($level, $message, array $context = [])
+    public function log($level, string|\Stringable $message, array $context = []): void
     {
         $this->messages[] = $message . ' ' . json_encode($context);
     }