1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge pull request #5245 from rubencm/ticket/15693

[ticket/15693] Fix get_rand_string()
This commit is contained in:
Marc Alexander
2018-06-17 15:44:28 +02:00
2 changed files with 14 additions and 4 deletions

View File

@@ -40,7 +40,10 @@ class phpbb_random_gen_rand_string_test extends phpbb_test_case
$random_string_length = strlen($random_string);
$this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH);
$this->assertTrue($random_string_length <= $num_chars);
$this->assertTrue(
$random_string_length == $num_chars,
sprintf('Failed asserting that random string length matches expected length. Expected %1$u, Actual %2$u', $num_chars, $random_string_length)
);
$this->assertRegExp('#^[A-Z0-9]+$#', $random_string);
}
}
@@ -56,7 +59,10 @@ class phpbb_random_gen_rand_string_test extends phpbb_test_case
$random_string_length = strlen($random_string);
$this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH);
$this->assertTrue($random_string_length <= $num_chars);
$this->assertTrue(
$random_string_length == $num_chars,
sprintf('Failed asserting that random string length matches expected length. Expected %1$u, Actual %2$u', $num_chars, $random_string_length)
);
$this->assertRegExp('#^[A-NP-Z1-9]+$#', $random_string);
}
}