From d6b44f2385db141a428c35a48b3bf6c17f85e43c Mon Sep 17 00:00:00 2001
From: Sabina Talipova <sabina.talipova@silverstripe.com>
Date: Fri, 9 Dec 2022 16:24:48 +1300
Subject: [PATCH] DEP PHP Support in CMS5

---
 _config.php                              |  3 ---
 composer.json                            | 10 +++++-----
 src/Controllers/CommentingController.php |  8 +-------
 tests/CommentsExtensionTest.php          |  4 ++--
 4 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 _config.php

diff --git a/_config.php b/_config.php
deleted file mode 100644
index 2fcbaa6..0000000
--- a/_config.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-\SilverStripe\Dev\Deprecation::notification_version('3.0', 'comments');
diff --git a/composer.json b/composer.json
index 3081b93..312b5d7 100644
--- a/composer.json
+++ b/composer.json
@@ -13,9 +13,9 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
-        "silverstripe/framework": "^4.10",
-        "colymba/gridfield-bulk-editing-tools": "^3.0.0-beta4"
+        "php": "^8.1",
+        "silverstripe/framework": "^5",
+        "colymba/gridfield-bulk-editing-tools": "^4"
     },
     "suggest": {
         "ezyang/htmlpurifier": "Standards compliant HTML filter written in PHP",
@@ -23,8 +23,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.0",
-        "ezyang/htmlpurifier": "^4.14"
+        "squizlabs/php_codesniffer": "^3",
+        "ezyang/htmlpurifier": "^4.16"
     },
     "extra": {
         "expose": [
diff --git a/src/Controllers/CommentingController.php b/src/Controllers/CommentingController.php
index 500e687..3246c3b 100644
--- a/src/Controllers/CommentingController.php
+++ b/src/Controllers/CommentingController.php
@@ -493,11 +493,7 @@ class CommentingController extends Controller
         return $form;
     }
 
-
-    /**
-     * @return HTTPResponse|false
-     */
-    public function redirectBack()
+    public function redirectBack(): HTTPResponse
     {
         // Don't cache the redirect back ever
         HTTPCacheControlMiddleware::singleton()->setMaxAge(0);
@@ -528,7 +524,5 @@ class CommentingController extends Controller
         if (Director::is_site_url($url)) {
             return $this->redirect($url);
         }
-
-        return false;
     }
 }
diff --git a/tests/CommentsExtensionTest.php b/tests/CommentsExtensionTest.php
index 142f0f1..c31798b 100644
--- a/tests/CommentsExtensionTest.php
+++ b/tests/CommentsExtensionTest.php
@@ -232,7 +232,7 @@ class CommentsExtensionTest extends FunctionalTest
 
     public function testGetCommentRSSLink()
     {
-        Config::modify()->merge('SilverStripe\\Control\\Director', 'alternate_base_url', 'http://unittesting.local');
+        Config::modify()->set('SilverStripe\\Control\\Director', 'alternate_base_url', 'http://unittesting.local');
 
         $item = $this->objFromFixture(CommentableItem::class, 'first');
         $link = $item->getCommentRSSLink();
@@ -241,7 +241,7 @@ class CommentsExtensionTest extends FunctionalTest
 
     public function testGetCommentRSSLinkPage()
     {
-        Config::modify()->merge('SilverStripe\\Control\\Director', 'alternate_base_url', 'http://unittesting.local');
+        Config::modify()->set('SilverStripe\\Control\\Director', 'alternate_base_url', 'http://unittesting.local');
 
         $item = $this->objFromFixture(CommentableItem::class, 'first');
         $page = $item->getCommentRSSLinkPage();