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

DEP PHP Support in CMS5
silverstripe · Jan 12, 2023 · 0f1da8c · 0f1da8c
2 parents 4a51782 + 29f0b39
commit 0f1da8c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -8,19 +8,19 @@
     ],
     "type": "silverstripe-vendormodule",
     "require": {
-        "php": "^7.4 || ^8.0",
-        "silverstripe/cms": "^4.0",
-        "silverstripe/lumberjack": "^2.0",
-        "silverstripe/tagfield": "^2.0",
-        "silverstripe/assets": "^1.0",
-        "silverstripe/asset-admin": "^1.0"
+        "php": "^8.1",
+        "silverstripe/cms": "^5",
+        "silverstripe/lumberjack": "^3.0",
+        "silverstripe/tagfield": "^3.0",
+        "silverstripe/assets": "^2.0",
+        "silverstripe/asset-admin": "^2.0"
     },
     "require-dev": {
-        "silverstripe/recipe-testing": "^2",
-        "squizlabs/php_codesniffer": "^3.0",
-        "silverstripe/widgets": "^2",
-        "silverstripe/comments": "^3.7",
-        "silverstripe/content-widget": "^2"
+        "silverstripe/recipe-testing": "^3",
+        "squizlabs/php_codesniffer": "^3",
+        "silverstripe/widgets": "^3",
+        "silverstripe/comments": "^4",
+        "silverstripe/content-widget": "^3"
     },
     "extra": {
         "expose": [

diff --git a/tests/php/BlogFunctionalTest.php b/tests/php/BlogFunctionalTest.php
@@ -11,8 +11,6 @@ class BlogFunctionalTest extends FunctionalTest
 {
     protected static $fixture_file = 'BlogFunctionalTest.yml';
 
-    protected static $use_draft_site = true;
-
     protected function setUp(): void
     {
         Config::modify()->set(URLSegmentFilter::class, 'default_allow_multibyte', true);
@@ -23,22 +21,25 @@ protected function setUp(): void
 
     public function testBlogWithMultibyteUrl()
     {
-        $result = $this->get(rawurlencode('آبید'));
+        $this->logInWithPermission('VIEW_DRAFT_CONTENT');
+        $result = $this->get(rawurlencode('آبید') . '?stage=Stage');
 
         $this->assertEquals(200, $result->getStatusCode());
     }
 
     public function testMemberProfileWithMultibyteUrlAndName()
     {
-        $result = $this->get(rawurlencode('آبید') . '/profile/' . rawurlencode('عبّاس-آبان'));
+        $this->logInWithPermission('VIEW_DRAFT_CONTENT');
+        $result = $this->get(rawurlencode('آبید') . '/profile/' . rawurlencode('عبّاس-آبان') . '?stage=Stage');
 
         $this->assertEquals(200, $result->getStatusCode());
         $this->assertStringContainsString('My Blog Post', $result->getBody());
     }
 
     public function testMemberProfileWithMultibyteUrlAndEnglishName()
     {
-        $result = $this->get(rawurlencode('آبید') . '/profile/bob-jones');
+        $this->logInWithPermission('VIEW_DRAFT_CONTENT');
+        $result = $this->get(rawurlencode('آبید') . '/profile/bob-jones' . '?stage=Stage');
 
         $this->assertEquals(200, $result->getStatusCode());
         $this->assertStringContainsString('My Blog Post', $result->getBody());

diff --git a/tests/php/Model/BlogControllerFunctionalTest.php b/tests/php/Model/BlogControllerFunctionalTest.php
@@ -11,8 +11,6 @@ class BlogControllerFunctionalTest extends FunctionalTest
 {
     protected static $fixture_file = 'BlogControllerFunctionalTest.yml';
 
-    protected static $use_draft_site = true;
-
     protected function setUp(): void
     {
         Config::modify()->set(URLSegmentFilter::class, 'default_allow_multibyte', true);
@@ -23,15 +21,17 @@ protected function setUp(): void
 
     public function testGetCategoriesWithMultibyteUrl()
     {
-        $result = $this->get('my-blog/category/' . rawurlencode('آبید'));
+        $this->logInWithPermission('VIEW_DRAFT_CONTENT');
+        $result = $this->get('my-blog/category/' . rawurlencode('آبید') . '?stage=Stage');
 
         $this->assertEquals(200, $result->getStatusCode());
         $this->assertStringContainsString('آبید', $result->getBody());
     }
 
     public function testGetTagsWithMultibyteUrl()
     {
-        $result = $this->get('my-blog/tag/' . rawurlencode('برتراند'));
+        $this->logInWithPermission('VIEW_DRAFT_CONTENT');
+        $result = $this->get('my-blog/tag/' . rawurlencode('برتراند')  . '?stage=Stage');
 
         $this->assertEquals(200, $result->getStatusCode());
         $this->assertStringContainsString('برتراند', $result->getBody());