API phpunit 9 support

silverstripe · Nov 5, 2021 · b6f1e38 · b6f1e38
1 parent e3bf7ac
commit b6f1e38
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -8,13 +8,15 @@
     ],
     "license": "BSD-3-Clause",
     "require": {
+        "php": "^7.3 || ^8.0",
+        "silverstripe/framework": "^4.10",
         "cwp/cwp-core": "^2",
         "silverstripe/cms": "^4",
         "silverstripe/taxonomy": "^2",
         "symbiote/silverstripe-gridfieldextensions": "^3.2"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3"
     },
     "suggest": {

diff --git a/tests/PageTypes/DatedUpdateHolderControllerTest.php b/tests/PageTypes/DatedUpdateHolderControllerTest.php
@@ -13,7 +13,7 @@ class DatedUpdateHolderControllerTest extends FunctionalTest
 
     protected static $use_draft_site = true;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -29,7 +29,7 @@ public function testSettingDateFiltersInReverseOrderShowsMessage()
 
         $result = $this->get($holder->Link() . '?from=2018-01-10&to=2018-01-01');
 
-        $this->assertContains('Filter has been applied with the dates reversed', $result->getBody());
+        $this->assertStringContainsString('Filter has been applied with the dates reversed', $result->getBody());
     }
 
     public function testSettingFromButNotToDateShowsMessage()
@@ -39,14 +39,14 @@ public function testSettingFromButNotToDateShowsMessage()
 
         $result = $this->get($holder->Link() . '?from=2018-01-10');
 
-        $this->assertContains('Filtered by a single date', $result->getBody());
+        $this->assertStringContainsString('Filtered by a single date', $result->getBody());
     }
 
     public function testInvalidDateFormat()
     {
         /** @var EventHolder $holder */
         $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
         $result = $this->get($holder->Link() . '?from=christmas&to=2018-01-10');
-        $this->assertContains(htmlentities('Dates must be in "y-MM-dd" format.'), $result->getBody());
+        $this->assertStringContainsString(htmlentities('Dates must be in "y-MM-dd" format.'), $result->getBody());
     }
 }
diff --git a/tests/PageTypes/SitemapPageTest.php b/tests/PageTypes/SitemapPageTest.php
@@ -13,7 +13,7 @@ class SitemapPageTest extends FunctionalTest
 
     protected static $use_draft_site = true;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/Report/CwpStatsReportTest.php b/tests/Report/CwpStatsReportTest.php
@@ -13,7 +13,7 @@ class CwpStatsReportTest extends SapphireTest
 {
     protected static $fixture_file = 'CwpStatsReportTest.yml';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         Config::modify()->set(SiteTree::class, 'create_default_pages', false);
 

diff --git a/tests/Tasks/PopulateThemeSampleDataTaskTest.php b/tests/Tasks/PopulateThemeSampleDataTaskTest.php
@@ -26,22 +26,22 @@ public function testOnlyCreateContactFormOnce()
         $task = new PopulateThemeSampleDataTask;
 
         // Run the task
-        $this->assertContains($createdMessage, $this->bufferedTask($task));
+        $this->assertStringContainsString($createdMessage, $this->bufferedTask($task));
 
         // Run a second time
-        $this->assertNotContains($createdMessage, $this->bufferedTask($task));
+        $this->assertStringNotContainsString($createdMessage, $this->bufferedTask($task));
 
         // Change the page name
         $form = UserDefinedForm::get()->filter('URLSegment', 'contact')->first();
         $form->URLSegment = 'testing';
         $form->write();
 
         // Ensure the old version is still detected in draft, so not recreated
-        $this->assertNotContains($createdMessage, $this->bufferedTask($task));
+        $this->assertStringNotContainsString($createdMessage, $this->bufferedTask($task));
 
         // Delete the page, then ensure it's recreated again (DataObject::delete will remove staged versions)
         $form->delete();
-        $this->assertContains($createdMessage, $this->bufferedTask($task));
+        $this->assertStringContainsString($createdMessage, $this->bufferedTask($task));
     }
 
     /**