From f626d463311f787fa9783782eada4c0dc6455483 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 2 Jun 2021 19:00:50 +1000
Subject: [PATCH] [php8-compat][phpunit8] Fix PHPUnit Warnings and fix a php
 error on function declaration syntax in core extension tests

---
 ext/afform/mock/ang/mockPublicForm.test.php   |  2 +-
 .../phpunit/Civi/AfformMock/FormTestCase.php  |  4 +--
 .../Civi/FlexMailer/MailingPreviewTest.php    | 32 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ext/afform/mock/ang/mockPublicForm.test.php b/ext/afform/mock/ang/mockPublicForm.test.php
index 3699eadfcb..0eff06c829 100644
--- a/ext/afform/mock/ang/mockPublicForm.test.php
+++ b/ext/afform/mock/ang/mockPublicForm.test.php
@@ -13,7 +13,7 @@ class MockPublicFormTest extends \Civi\AfformMock\FormTestCase {
     $this->assertContentType('text/html', $r);
     $this->assertStatusCode(200, $r);
     $body = (string) $r->getBody();
-    $this->assertContains('mockPublicForm', $body);
+    $this->assertStringContainsString('mockPublicForm', $body);
   }
 
   public function testPublicCreateAllowed() {
diff --git a/ext/afform/mock/tests/phpunit/Civi/AfformMock/FormTestCase.php b/ext/afform/mock/tests/phpunit/Civi/AfformMock/FormTestCase.php
index 113529ff8e..f794a073ff 100644
--- a/ext/afform/mock/tests/phpunit/Civi/AfformMock/FormTestCase.php
+++ b/ext/afform/mock/tests/phpunit/Civi/AfformMock/FormTestCase.php
@@ -29,7 +29,7 @@ abstract class FormTestCase extends \PHPUnit\Framework\TestCase implements \Civi
 
   protected $formName = NULL;
 
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     if ($this->formName === NULL && preg_match(';^(.*)\.test\.php$;', basename(static::FILE), $m)) {
@@ -45,7 +45,7 @@ abstract class FormTestCase extends \PHPUnit\Framework\TestCase implements \Civi
     }
   }
 
-  protected function tearDown() {
+  protected function tearDown(): void {
     parent::tearDown();
   }
 
diff --git a/ext/flexmailer/tests/phpunit/Civi/FlexMailer/MailingPreviewTest.php b/ext/flexmailer/tests/phpunit/Civi/FlexMailer/MailingPreviewTest.php
index a6fadbdc8c..aad8443ce4 100644
--- a/ext/flexmailer/tests/phpunit/Civi/FlexMailer/MailingPreviewTest.php
+++ b/ext/flexmailer/tests/phpunit/Civi/FlexMailer/MailingPreviewTest.php
@@ -86,15 +86,15 @@ class MailingPreviewTest extends \CiviUnitTestCase {
     $this->assertEquals("[CiviMail Draft] Hello $displayName",
       $previewResult['values']['subject']);
 
-    $this->assertContains("This is $displayName", $previewResult['values']['body_text']);
-    $this->assertContains("civicrm/mailing/optout", $previewResult['values']['body_text']);
-    $this->assertContains("&jid=&qid=&h=fakehash", $previewResult['values']['body_text']);
-    $this->assertContains("subj=(Hello ", $previewResult['values']['body_text']);
+    $this->assertStringContainsString("This is $displayName", $previewResult['values']['body_text']);
+    $this->assertStringContainsString("civicrm/mailing/optout", $previewResult['values']['body_text']);
+    $this->assertStringContainsString("&jid=&qid=&h=fakehash", $previewResult['values']['body_text']);
+    $this->assertStringContainsString("subj=(Hello ", $previewResult['values']['body_text']);
 
-    $this->assertContains("<p>This is $displayName.</p>", $previewResult['values']['body_html']);
-    $this->assertContains("civicrm/mailing/optout", $previewResult['values']['body_html']);
-    $this->assertContains("&amp;jid=&amp;qid=&amp;h=fakehash", $previewResult['values']['body_html']);
-    $this->assertContains("subj=(Hello ", $previewResult['values']['body_html']);
+    $this->assertStringContainsString("<p>This is $displayName.</p>", $previewResult['values']['body_html']);
+    $this->assertStringContainsString("civicrm/mailing/optout", $previewResult['values']['body_html']);
+    $this->assertStringContainsString("&amp;jid=&amp;qid=&amp;h=fakehash", $previewResult['values']['body_html']);
+    $this->assertStringContainsString("subj=(Hello ", $previewResult['values']['body_html']);
 
     $this->assertEquals('flexmailer', $previewResult['values']['_rendered_by_']);
   }
@@ -115,15 +115,15 @@ class MailingPreviewTest extends \CiviUnitTestCase {
     $this->assertEquals("[CiviMail Draft] Hello $displayName",
       $previewResult['values']['subject']);
 
-    $this->assertContains("This is $displayName", $previewResult['values']['body_text']);
-    $this->assertContains("civicrm/mailing/optout", $previewResult['values']['body_text']);
-    $this->assertContains("&jid=&qid=&h=fakehash", $previewResult['values']['body_text']);
-    $this->assertContains("subj=(Hello ", $previewResult['values']['body_text']);
+    $this->assertStringContainsString("This is $displayName", $previewResult['values']['body_text']);
+    $this->assertStringContainsString("civicrm/mailing/optout", $previewResult['values']['body_text']);
+    $this->assertStringContainsString("&jid=&qid=&h=fakehash", $previewResult['values']['body_text']);
+    $this->assertStringContainsString("subj=(Hello ", $previewResult['values']['body_text']);
 
-    $this->assertContains("<p>This is $displayName.</p>", $previewResult['values']['body_html']);
-    $this->assertContains("civicrm/mailing/optout", $previewResult['values']['body_html']);
-    $this->assertContains("&amp;jid=&amp;qid=&amp;h=fakehash", $previewResult['values']['body_html']);
-    $this->assertContains("subj=(Hello ", $previewResult['values']['body_html']);
+    $this->assertStringContainsString("<p>This is $displayName.</p>", $previewResult['values']['body_html']);
+    $this->assertStringContainsString("civicrm/mailing/optout", $previewResult['values']['body_html']);
+    $this->assertStringContainsString("&amp;jid=&amp;qid=&amp;h=fakehash", $previewResult['values']['body_html']);
+    $this->assertStringContainsString("subj=(Hello ", $previewResult['values']['body_html']);
 
     $this->assertEquals('flexmailer', $previewResult['values']['_rendered_by_']);
   }
-- 
2.25.1