Fix tests

iMattPro · iMattPro · commit 76d4d86b4227 · 2025-09-20T07:58:01.000-07:00
diff --git a/tests/event/listener_test.php b/tests/event/listener_test.php
@@ -530,7 +530,7 @@ public function test_setup_cache_dir($cache)
 	 *
 	 * @return array
 	 */
-	public function append_agreement_data()
+	public static function append_agreement_data()
 	{
 		return [
 			[false, 'PRIVACY', 0], // No agreement
@@ -553,8 +553,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
`@@ -530,7 +530,7 @@ public function test_setup_cache_dir($cache)`
`530`	`530`	`*`
`531`	`531`	`* @return array`
`532`	`532`	`*/`
`533`		`- public function append_agreement_data()`
	`533`	`+ public static function append_agreement_data()`
`534`	`534`	`{`
`535`	`535`	`return [`
`536`	`536`	`[false, 'PRIVACY', 0], // No agreement`
`@@ -553,8 +553,10 @@ public function test_append_agreement($s_agreement, $agreement_title, $expected_`
`553`	`553`
`554`	`554`	`$this->template->expects(self::atMost(2))`
`555`	`555`	`->method('retrieve_var')`
`556`		`- ->withConsecutive(['S_AGREEMENT'], ['AGREEMENT_TITLE'])`
`557`		`- ->willReturnOnConsecutiveCalls($s_agreement, $this->language->lang($agreement_title));`
	`556`	`+ ->willReturnMap([`
	`557`	`+ ['S_AGREEMENT', $s_agreement],`
	`558`	`+ ['AGREEMENT_TITLE', $this->language->lang($agreement_title)]`
	`559`	`+ ]);`
`558`	`560`
`559`	`561`	`if ($expected_append_calls > 0)`
`560`	`562`	`{`