Refactor withConsecutive()

Author: iMattPro

ext.php

@@ -31,6 +31,6 @@ class ext extends \phpbb\extension\base
 	 */
 	public function is_enableable()
 	{
-		return phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>=') && PHP_VERSION_ID >= 80100;
+		return PHP_VERSION_ID >= 80100 && phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>=');
 	}
 }

tests/acp/acp_module_test.php

@@ -104,15 +104,16 @@ public function test_main_module()
 			->disableOriginalConstructor()
 			->getMock();
 
+		$services = ['language', 'phpbb.topicprefixes.admin_controller'];
+		$returns = [$language, $admin_controller];
+		$callCount = 0;
 		$phpbb_container
 			->expects(self::exactly(2))
 			->method('get')
-			->withConsecutive(
-				['language'], ['phpbb.topicprefixes.admin_controller']
-			)
-			->willReturnOnConsecutiveCalls(
-				$language, $admin_controller
-			);
+			->willReturnCallback(function($service) use ($services, $returns, &$callCount) {
+				$this->assertEquals($services[$callCount], $service);
+				return $returns[$callCount++];
+			});
 
 		$admin_controller
 			->expects(self::once())