fix phpunit test step email

Author: bluetom

step/email/lib.php

@@ -118,7 +118,7 @@ public function post_processing_bulk_operation() {
                     ['instanceid' => $step->id,
                         'touser' => $user->id, ]);
 
-                $parsedsettings = $this->replace_placeholders($settings, $user, $step->id, $mailentries);
+                $parsedsettings = $this->replace_placeholders($settings, $user, $mailentries);
                 $subject = $parsedsettings['subject'];
                 $content = $parsedsettings['content'];
                 $contenthtml = $parsedsettings['contenthtml'];
@@ -148,14 +148,13 @@ public function post_processing_bulk_operation() {
     /**
      * Replaces certain placeholders within the mail template.
      * @param string[] $strings array of mail templates.
-     * @param core_user $user User object.
-     * @param int $stepid Id of the step instance.
+     * @param \stdClass $user User object.
      * @param array[] $mailentries Array consisting of course entries from the database.
      * @return string[] array of mail text.
      * @throws \dml_exception
      * @throws \moodle_exception
      */
-    public function replace_placeholders($strings, $user, $stepid, $mailentries) {
+    public function replace_placeholders($strings, $user, $mailentries) {
         global $CFG;
 
         $patterns = [];

step/email/tests/lib_test.php

@@ -50,12 +50,19 @@ public function test_replace_placeholders(): void {
         $course1 = $this->getDataGenerator()->create_course(['fullname' => 'Course 1', 'shortname' => 'C1']);
         $course2 = $this->getDataGenerator()->create_course(['fullname' => 'Course 2', 'shortname' => 'C2']);
         $lib = new email();
-        $response = $lib->replace_placeholders([
+        $response = $lib->replace_placeholders(
+            [
                 "##firstname##\n##lastname##\n##courses##\n##shortcourses##",
                 "##firstname##<br>##lastname##<br>##courses-html##<br>##shortcourses-html##",
-        ], $user1, 0, [(object) ['courseid' => $course1->id], (object) ['courseid' => $course2->id]]);
+            ],
+            $user1,
+            [
+                (object) ['courseid' => $course1->id],
+                (object) ['courseid' => $course2->id],
+            ]
+        );
         $this->assertCount(2, $response);
-        $this->assertEquals("Jane\nDoe\nCourse 1\nCourse 2\nC1\nC2", $response[0]);
+        $this->assertEquals("Jane\nDoe\nCourse 1\r\nCourse 2\nC1\r\nC2", $response[0]);
         $this->assertEquals("Jane<br>Doe<br>Course 1<br>Course 2<br>C1<br>C2", $response[1]);
     }
 }