Fix tests

iMattPro · iMattPro · commit 6ef99fae6d78 · 2025-09-20T08:10:36.000-07:00
diff --git a/tests/event/listener_test.php b/tests/event/listener_test.php
@@ -261,7 +261,7 @@ public function test_validate_googleanalytics_id($cfg_array, $expected_error)
 	 *
 	 * @return array
 	 */
-	public function append_agreement_data()
+	public static function append_agreement_data()
 	{
 		return [
 			[false, 'PRIVACY', 0], // No agreement
@@ -285,8 +285,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
`@@ -261,7 +261,7 @@ public function test_validate_googleanalytics_id($cfg_array, $expected_error)`
`261`	`261`	`*`
`262`	`262`	`* @return array`
`263`	`263`	`*/`
`264`		`- public function append_agreement_data()`
	`264`	`+ public static function append_agreement_data()`
`265`	`265`	`{`
`266`	`266`	`return [`
`267`	`267`	`[false, 'PRIVACY', 0], // No agreement`
`@@ -285,8 +285,10 @@ public function test_append_agreement($s_agreement, $agreement_title, $expected_`
`285`	`285`
`286`	`286`	`$this->template->expects(self::atMost(2))`
`287`	`287`	`->method('retrieve_var')`
`288`		`- ->withConsecutive(['S_AGREEMENT'], ['AGREEMENT_TITLE'])`
`289`		`- ->willReturnOnConsecutiveCalls($s_agreement, $this->language->lang($agreement_title));`
	`288`	`+ ->willReturnMap([`
	`289`	`+ ['S_AGREEMENT', $s_agreement],`
	`290`	`+ ['AGREEMENT_TITLE', $this->language->lang($agreement_title)]`
	`291`	`+ ]);`
`290`	`292`
`291`	`293`	`if ($expected_append_calls > 0)`
`292`	`294`	`{`