Merge pull request #354 from creative-commoners/pulls/4/upgrade-cms5

DEP PHP Support in CMS5
silverstripe · Jan 9, 2023 · 81902f6 · 81902f6
2 parents 5d044bd + d6b44f2
commit 81902f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/_config.php b/_config.php
diff --git a/composer.json b/composer.json
@@ -13,18 +13,18 @@
         }
     ],
     "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",
         "silverstripe/cms": "The SilverStripe Content Management System"
     },
     "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
@@ -493,11 +493,7 @@ public function CommentsForm()
         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 @@ public function redirectBack()
         if (Director::is_site_url($url)) {
             return $this->redirect($url);
         }
-
-        return false;
     }
 }
diff --git a/tests/CommentsExtensionTest.php b/tests/CommentsExtensionTest.php
@@ -232,7 +232,7 @@ public function testCanModerateComments()
 
     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 @@ public function testGetCommentRSSLink()
 
     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();