Refactor withConsecutive()

Author: iMattPro

tests/controller/acp_controller_test.php

@@ -300,17 +300,32 @@ public function test_action_add($id, $data)
 	{
 		$controller = $this->get_controller();
 
+		$variable_expectations = [
+			['action', '', 'add'],
+			['id', 0, $id]
+		];
 		$this->request
 			->expects(self::exactly(2))
 			->method('variable')
-			->withConsecutive(['action', ''], ['id', 0])
-			->willReturnOnConsecutiveCalls('add', $id);
-
+			->willReturnCallback(function($arg1, $arg2) use (&$variable_expectations) {
+				$expectation = array_shift($variable_expectations);
+				self::assertEquals($expectation[0], $arg1);
+				self::assertEquals($expectation[1], $arg2);
+				return $expectation[2];
+			});
+
+		$post_expectations = [
+			['submit', false],
+			['preview', false]
+		];
 		$this->request
 			->expects(self::exactly(2))
 			->method('is_set_post')
-			->withConsecutive(['submit'], ['preview'])
-			->willReturnOnConsecutiveCalls(false, false);
+			->willReturnCallback(function($arg) use (&$post_expectations) {
+				$expectation = array_shift($post_expectations);
+				self::assertEquals($expectation[0], $arg);
+				return $expectation[1];
+			});
 
 		$this->manager->expects(self::once())
 			->method('announcement_columns')
@@ -384,31 +399,34 @@ public function test_action_add_submit($id, $form, $preview, $submit, $valid_for
 			$this->setExpectedTriggerError(E_USER_NOTICE, 'BOARD_ANNOUNCEMENTS_UPDATED');
 		}
 
+		$variable_invocation = 0;
+		$expected_args = [
+			['action', ''], ['id', 0], ['board_announcements_text', ''], ['board_announcements_description', ''],
+			['board_announcements_bgcolor', ''], ['board_announcements_enabled', true], ['board_announcements_users', 0],
+			['board_announcements_locations', [0]], ['board_announcements_dismiss', true], ['board_announcements_expiry', ''],
+			['disable_bbcode', false], ['disable_magic_url', false], ['disable_smilies', false]
+		];
 		$this->request
 			->expects(self::exactly(13))
 			->method('variable')
-			->withConsecutive(
-				['action', ''],
-				['id', 0],
-				['board_announcements_text', ''],
-				['board_announcements_description', ''],
-				['board_announcements_bgcolor', ''],
-				['board_announcements_enabled', true],
-				['board_announcements_users', 0],
-				['board_announcements_locations', [0]],
-				['board_announcements_dismiss', true],
-				['board_announcements_expiry', ''],
-				['disable_bbcode', false],
-				['disable_magic_url', false],
-				['disable_smilies', false]
-			)
-			->willReturnOnConsecutiveCalls(...$form);
-
+			->willReturnCallback(function($arg1, $arg2) use (&$variable_invocation, $expected_args, $form) {
+				self::assertEquals($expected_args[$variable_invocation][0], $arg1);
+				self::assertEquals($expected_args[$variable_invocation][1], $arg2);
+				return $form[$variable_invocation++];
+			});
+
+		$post_expectations = [
+			['submit', $submit],
+			['preview', $preview]
+		];
 		$this->request
 			->expects(self::exactly(2))
 			->method('is_set_post')
-			->withConsecutive(['submit'], ['preview'])
-			->willReturnOnConsecutiveCalls($submit, $preview);
+			->willReturnCallback(function($arg) use (&$post_expectations) {
+				$expectation = array_shift($post_expectations);
+				self::assertEquals($expectation[0], $arg);
+				return $expectation[1];
+			});
 
 		$this->manager->expects($submit && !$errors ? self::never() : self::once())
 			->method('decode_json')
@@ -462,11 +480,18 @@ public function test_action_delete($id, $confirm_action, $success)
 
 		$controller = $this->get_controller();
 
+		$variable_invocation = 0;
+		$expected_calls = $confirm_action ? 2 : 4;
+		$expected_args = [['action', ''], ['id', 0], ['i', ''], ['mode', '']];
+		$expected_returns = ['delete', $id, '', ''];
 		$this->request
-			->expects(self::exactly($confirm_action ? 2 : 4))
+			->expects(self::exactly($expected_calls))
 			->method('variable')
-			->withConsecutive(['action', ''], ['id', 0], ['i', ''], ['mode', ''])
-			->willReturnOnConsecutiveCalls('delete', $id, '', '');
+			->willReturnCallback(function($arg1, $arg2) use (&$variable_invocation, $expected_args, $expected_returns) {
+				self::assertEquals($expected_args[$variable_invocation][0], $arg1);
+				self::assertEquals($expected_args[$variable_invocation][1], $arg2);
+				return $expected_returns[$variable_invocation++];
+			});
 
 		if (!$confirm_action)
 		{
@@ -553,10 +578,16 @@ public function test_action_move($id, $dir, $valid, $error, $is_ajax)
 			$this->setExpectedTriggerError(E_WARNING);
 		}
 
+		$variable_invocation = 0;
+		$expected_args = [['action', ''], ['id', 0], ['dir', ''], ['hash', '']];
+		$expected_returns = ['move', $id, $dir, ($valid ? generate_link_hash($dir . $id) : '')];
 		$this->request->expects(self::exactly(4))
 			->method('variable')
-			->withConsecutive(['action', ''], ['id', 0], ['dir', ''], ['hash', ''])
-			->willReturnOnConsecutiveCalls('move', $id, $dir, ($valid ? generate_link_hash($dir . $id) : ''));
+			->willReturnCallback(function($arg1, $arg2) use (&$variable_invocation, $expected_args, $expected_returns) {
+				self::assertEquals($expected_args[$variable_invocation][0], $arg1);
+				self::assertEquals($expected_args[$variable_invocation][1], $arg2);
+				return $expected_returns[$variable_invocation++];
+			});
 
 		$this->request->expects($valid && !$error ? self::once() : self::never())
 			->method('is_ajax')
@@ -603,16 +634,25 @@ public function test_action_settings($enable, $valid_form)
 			$this->setExpectedTriggerError(E_USER_WARNING, 'The submitted form was invalid. Try submitting again.');
 			$this->request->expects(self::once())
 				->method('variable')
-				->withConsecutive(['action', ''])
-				->willReturnOnConsecutiveCalls('settings');
+				->with('action', '')
+				->willReturn('settings');
 		}
 		else
 		{
 			$this->setExpectedTriggerError(E_USER_NOTICE, 'CONFIG_UPDATED');
-			$this->request->expects(self::exactly(2))
+			$variable_expectations = [
+				['action', '', 'settings'],
+				['board_announcements_enable_all', 0, $enable]
+			];
+			$this->request
+				->expects(self::exactly(2))
 				->method('variable')
-				->withConsecutive(['action', ''], ['board_announcements_enable_all', 0])
-				->willReturnOnConsecutiveCalls('settings', $enable);
+				->willReturnCallback(function($arg1, $arg2) use (&$variable_expectations) {
+					$expectation = array_shift($variable_expectations);
+					self::assertEquals($expectation[0], $arg1);
+					self::assertEquals($expectation[1], $arg2);
+					return $expectation[2];
+				});
 			$this->config->expects(self::once())
 				->method('set')
 				->with('board_announcements_enable', $enable);

tests/cron/cron_test.php

@@ -60,14 +60,13 @@ public function test_run($expired_set)
 			->with('announcement_id')
 			->willReturn($expired_set);
 
-		array_walk($expired_set, static function (&$value) {
-			$value = [$value];
-		});
-
 		// Check disable_announcement get called as expected
+		$invocation = 0;
 		$this->manager->expects(self::exactly(count($expired_set)))
 			->method('disable_announcement')
-			->withConsecutive(...$expired_set);
+			->willReturnCallback(function($arg) use (&$invocation, $expired_set) {
+				self::assertEquals($expired_set[$invocation++], $arg);
+			});
 
 		// Run the cron task
 		$this->cron_task->run();

tests/event/listener_test.php

@@ -250,9 +250,16 @@ public function test_display_board_announcements($user_id, $page, $enabled, $exp
 
 		$this->set_listener();
 
+		$invocation = 0;
 		$this->template->expects($enabled ? self::atLeastOnce() : self::never())
 			->method('assign_block_vars')
-			->withConsecutive(...$expected);
+			->willReturnCallback(function($block, $vars) use (&$invocation, $expected) {
+				if (isset($expected[$invocation])) {
+					self::assertEquals($expected[$invocation][0], $block);
+					self::assertEquals($expected[$invocation][1], $vars);
+					$invocation++;
+				}
+			});
 
 		$this->request->expects(self::atMost(10))
 			->method('variable')