Fixed EmaiTrait not correctly working with email parameters.

drevops · Dec 16, 2020 · 8612677 · 8612677
1 parent 4c58f80
commit 8612677
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/D8/EmailTrait.php b/src/D8/EmailTrait.php
@@ -136,7 +136,7 @@ public function emailAssertEmailContains($field, PyStringNode $string, $exact =
     $string = strval($string);
     $string = $exact ? $string : trim(preg_replace('/\s+/', ' ', $string));
     foreach (self::emailGetCollectedEmails() as $email) {
-      $field_string = $email['params'][$field] ?? $email[$field];
+      $field_string = $email[$field] ?? '';
       $field_string = $exact ? $field_string : trim(preg_replace('/\s+/', ' ', $field_string));
       if (strpos($field_string, $string) !== FALSE) {
         return $email;

diff --git a/tests/behat/fixtures/d8/docroot/modules/custom/mysite_core/mysite_core.module b/tests/behat/fixtures/d8/docroot/modules/custom/mysite_core/mysite_core.module
@@ -24,4 +24,5 @@ function mysite_core_mail($key, &$message, $params) {
       $message['subject'] = t('Test Email');
       break;
   }
+  $message['body'][] = strval($params['body']) ?? '';
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,5 @@ function mysite_core_mail($key, &$message, $params) { @@
           $message['subject'] = t('Test Email');
           break;
       }
+      $message['body'][] = strval($params['body']) ?? '';
     }