From 3543a3759828612ba50c0fc548fcc70ebe8e2ff6 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 22 May 2021 10:28:04 +1000
Subject: [PATCH] Fix PHPUnit8 Warning notices in E2E And in some API unit
 tests

---
 Civi/Test/Api3TestTrait.php                 | 2 +-
 tests/phpunit/CRM/Mailing/BAO/SpoolTest.php | 4 ++--
 tests/phpunit/E2E/Extern/SoapTest.php       | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Civi/Test/Api3TestTrait.php b/Civi/Test/Api3TestTrait.php
index a9b985178b..f544be76f2 100644
--- a/Civi/Test/Api3TestTrait.php
+++ b/Civi/Test/Api3TestTrait.php
@@ -81,7 +81,7 @@ trait Api3TestTrait {
       $prefix .= ': ';
     }
     if ($expectedError && !empty($apiResult['is_error'])) {
-      $this->assertContains($expectedError, $apiResult['error_message'], 'api error message not as expected' . $prefix);
+      $this->assertStringContainsString($expectedError, $apiResult['error_message'], 'api error message not as expected' . $prefix);
     }
     $this->assertEquals(1, $apiResult['is_error'], "api call should have failed but it succeeded " . $prefix . (print_r($apiResult, TRUE)));
     $this->assertNotEmpty($apiResult['error_message']);
diff --git a/tests/phpunit/CRM/Mailing/BAO/SpoolTest.php b/tests/phpunit/CRM/Mailing/BAO/SpoolTest.php
index 19bc8d58b7..9cd504024d 100644
--- a/tests/phpunit/CRM/Mailing/BAO/SpoolTest.php
+++ b/tests/phpunit/CRM/Mailing/BAO/SpoolTest.php
@@ -78,11 +78,11 @@ class CRM_Mailing_BAO_SpoolTest extends CiviUnitTestCase {
     if ($mailPart instanceof ezcMailText) {
       switch ($mailPart->subType) {
         case 'plain':
-          self::assertContains(self::$bodytext, $mailPart->generateBody());
+          self::assertStringContainsString(self::$bodytext, $mailPart->generateBody());
           break;
 
         case 'html':
-          self::assertContains(self::$bodytext . '</p>', $mailPart->generateBody());
+          self::assertStringContainsString(self::$bodytext . '</p>', $mailPart->generateBody());
           break;
       }
     }
diff --git a/tests/phpunit/E2E/Extern/SoapTest.php b/tests/phpunit/E2E/Extern/SoapTest.php
index 63a8c53553..5ba54381f7 100644
--- a/tests/phpunit/E2E/Extern/SoapTest.php
+++ b/tests/phpunit/E2E/Extern/SoapTest.php
@@ -47,20 +47,18 @@ class E2E_Extern_SoapTest extends CiviEndToEndTestCase {
 
   /**
    * Send a request with bad credentials.
-   *
-   * @expectedException SoapFault
    */
   public function testAuthenticationBadPassword() {
+    $this->expectException(SoapFault::class);
     $client = $this->createClient();
     $client->authenticate($this->adminUser, mt_rand());
   }
 
   /**
    * Send a request with bad credentials.
-   *
-   * @expectedException SoapFault
    */
   public function testAuthenticationBadKey() {
+    $this->expectException(SoapFault::class);
     $client = $this->createClient();
     $key = $client->authenticate($this->adminUser, $this->adminPass);
     $client->get_contact(mt_rand(), []);
-- 
2.25.1