Fix tests

Author: iMattPro

tests/conditions/birthdays_test.php

@@ -42,7 +42,7 @@ public function get_condition()
 	 *
 	 * @return array Array of test data
 	 */
-	public static function check_condition_test_data()
+	public static function check_condition_test_data(): array
 	{
 		return array(
 			array(
@@ -81,7 +81,7 @@ public static function check_condition_test_data()
 	 * @param int $user_id
 	 * @param int $data The age in years of a user
 	 */
-	public function helper_update_user_data($user_id, $data)
+	public function helper_update_user_data(int $user_id, int $data)
 	{
 		$now = getdate(time());
 		$birthday = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], ($now['year'] - $data));

tests/conditions/lastvisit_test.php

@@ -43,7 +43,7 @@ public function get_condition()
 	 *
 	 * @return array Array of test data
 	 */
-	public static function check_condition_test_data()
+	public static function check_condition_test_data(): array
 	{
 		return array(
 			array(
@@ -139,7 +139,7 @@ public static function check_condition_test_data()
 	 * @param int $user_id
 	 * @param int $data The number of days since a user has last visited
 	 */
-	public function helper_update_user_data($user_id, $data)
+	public function helper_update_user_data(int $user_id, int $data)
 	{
 		$sql = 'UPDATE phpbb_users
 			SET user_lastvisit = ' . (int) (strtotime("$data days ago")) . '

tests/conditions/membership_test.php

@@ -43,7 +43,7 @@ public function get_condition()
 	 *
 	 * @return array Array of test data
 	 */
-	public static function check_condition_test_data()
+	public static function check_condition_test_data(): array
 	{
 		return array(
 			array(
@@ -124,7 +124,7 @@ public static function check_condition_test_data()
 	 * @param int $user_id
 	 * @param int $data The number of days a user has been registered
 	 */
-	public function helper_update_user_data($user_id, $data)
+	public function helper_update_user_data(int $user_id, int $data)
 	{
 		$sql = 'UPDATE phpbb_users
 			SET user_regdate = ' . (int) (strtotime("$data days ago")) . '

tests/conditions/posts_test.php

@@ -42,7 +42,7 @@ public function get_condition()
 	 *
 	 * @return array Array of test data
 	 */
-	public static function check_condition_test_data()
+	public static function check_condition_test_data(): array
 	{
 		return array(
 			array(
@@ -233,7 +233,7 @@ public function test_check_no_options($user_id, $post_count, $expected)
 	 * @param int $user_id
 	 * @param int $data The number of posts a user has
 	 */
-	public function helper_update_user_data($user_id, $data)
+	public function helper_update_user_data(int $user_id, int $data)
 	{
 		$sql = 'UPDATE ' . USERS_TABLE . '
 			SET user_posts = ' . (int) $data . '

tests/conditions/type_test_case.php

@@ -16,12 +16,17 @@
  */
 abstract class type_test_case extends base
 {
+	public static function check_condition_test_data(): array
+	{
+		return [];
+	}
+
 	/**
 	 * Test the condition type's check method
 	 *
 	 * @dataProvider check_condition_test_data
 	 */
-	public function test_check_condition($user_data, $expected, $default, $options)
+	public function test_check_condition($user_data, $expected, $default, $options): void
 	{
 		// Prepare the users data for checking
 		foreach ($user_data as $user_id => $data)
@@ -56,7 +61,7 @@ public function test_check_condition($user_data, $expected, $default, $options)
 	 *
 	 * @dataProvider check_condition_test_data
 	 */
-	public function test_check_condition_with_users($user_data, $expected, $default)
+	public function test_check_condition_with_users($user_data, $expected, $default): void
 	{
 		// Update the users regdate timestamp
 		foreach ($user_data as $user_id => $data)
@@ -93,7 +98,7 @@ public function test_check_condition_with_users($user_data, $expected, $default)
 	 * @param array $user_ids
 	 * @return array Array of user ids and their default group ids
 	 */
-	public function helper_default_groups($user_ids)
+	public function helper_default_groups(array $user_ids): array
 	{
 		$sql = 'SELECT user_id, group_id
 			FROM phpbb_users
@@ -116,5 +121,5 @@ public function helper_default_groups($user_ids)
 	 * @param int $user_id
 	 * @param int $data
 	 */
-	abstract public function helper_update_user_data($user_id, $data);
+	abstract public function helper_update_user_data(int $user_id, int $data);
 }

tests/conditions/warnings_test.php

@@ -43,7 +43,7 @@ public function get_condition()
 	 *
 	 * @return array Array of test data
 	 */
-	public static function check_condition_test_data()
+	public static function check_condition_test_data(): array
 	{
 		return array(
 			array(
@@ -109,7 +109,7 @@ public static function check_condition_test_data()
 	 * @param int $user_id
 	 * @param int $data The number of warnings
 	 */
-	public function helper_update_user_data($user_id, $data)
+	public function helper_update_user_data(int $user_id, int $data)
 	{
 		$sql = 'UPDATE phpbb_users
 			SET user_warnings = ' . (int) $data . '

tests/functional/membership_test.php

@@ -22,7 +22,7 @@ class membership_test extends autogroups_base
 		'max'        => 10,
 	);
 
-	protected $test_user = 'user-ag-test';
+	protected $test_user = 'agTestUser1';
 
 	/**
 	 * Test the auto groups membership type
@@ -61,15 +61,15 @@ public function test_user_registration()
 		$this->logout();
 		$this->add_lang('ucp');
 		$crawler = self::request('GET', 'ucp.php?mode=register');
-		$form = $crawler->selectButton('I agree to these terms')->form();
+		$form = $crawler->selectButton($this->lang('AGREE'))->form();
 		$crawler = self::submit($form);
 		$form = $crawler->selectButton('Submit')->form(array(
 			'username'			=> $this->test_user,
 			'email'				=> $this->test_user . '@phpbb.com',
 			'new_password'		=> $this->test_user . $this->test_user,
 			'password_confirm'	=> $this->test_user . $this->test_user,
 		));
-		$form['tz']->select('Europe/Berlin');
+		//$form['tz']->select('Europe/Berlin');
 		$crawler = self::submit($form);
 		$this->assertContainsLang('ACCOUNT_ADDED', $crawler->filter('#message')->text());
 		$new_user_id = $this->get_new_user_id();