Merge branch '4.10' into 4

2022-03-08 16:06:08 +13:00 · 2022-03-08 16:06:08 +13:00 · 59f23ad2aa
parent 7d8ea82be4 a007794789
commit 59f23ad2aa
1 changed files with 1 additions and 2 deletions
--- a/tests/php/Control/Email/EmailTest.php
+++ b/tests/php/Control/Email/EmailTest.php
@ -24,8 +24,7 @@ use Swift_RfcComplianceException;

 class EmailTest extends SapphireTest
 {
-
-    protected function setUp()
+    protected function setUp(): void
    {
        parent::setUp();
        Director::config()->set('alternate_base_url', 'http://www.mysite.com/');