Fix tests

iMattPro · iMattPro · commit ca21c3691417 · 2025-09-20T08:11:00.000-07:00
diff --git a/tests/event/amend_agreement_test.php b/tests/event/amend_agreement_test.php
@@ -17,7 +17,7 @@ class amend_agreement_test extends main_listener_base
 	 *
 	 * @return array
 	 */
-	public function append_agreement_data()
+	public static function append_agreement_data()
 	{
 		return [
 			[false, 'PRIVACY', 0], // No agreement
@@ -41,8 +41,10 @@ public function test_append_agreement($s_agreement, $agreement_title, $expected_
 
 		$this->template->expects(self::atMost(2))
 			->method('retrieve_var')
-			->withConsecutive(['S_AGREEMENT'], ['AGREEMENT_TITLE'])
-			->willReturnOnConsecutiveCalls($s_agreement, $this->language->lang($agreement_title));
+			->willReturnMap([
+				['S_AGREEMENT', $s_agreement],
+				['AGREEMENT_TITLE', $this->language->lang($agreement_title)]
+			]);
 
 		if ($expected_append_calls > 0)
 		{

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class amend_agreement_test extends main_listener_base`
`17`	`17`	`*`
`18`	`18`	`* @return array`
`19`	`19`	`*/`
`20`		`- public function append_agreement_data()`
	`20`	`+ public static function append_agreement_data()`
`21`	`21`	`{`
`22`	`22`	`return [`
`23`	`23`	`[false, 'PRIVACY', 0], // No agreement`
`@@ -41,8 +41,10 @@ public function test_append_agreement($s_agreement, $agreement_title, $expected_`
`41`	`41`
`42`	`42`	`$this->template->expects(self::atMost(2))`
`43`	`43`	`->method('retrieve_var')`
`44`		`- ->withConsecutive(['S_AGREEMENT'], ['AGREEMENT_TITLE'])`
`45`		`- ->willReturnOnConsecutiveCalls($s_agreement, $this->language->lang($agreement_title));`
	`44`	`+ ->willReturnMap([`
	`45`	`+ ['S_AGREEMENT', $s_agreement],`
	`46`	`+ ['AGREEMENT_TITLE', $this->language->lang($agreement_title)]`
	`47`	`+ ]);`
`46`	`48`
`47`	`49`	`if ($expected_append_calls > 0)`
`48`	`50`	`{`