mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-13 14:58:52 +00:00
Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympus
* naderman/ticket/10394: [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
This commit is contained in:
commit
13b718e720
2 changed files with 3 additions and 3 deletions
|
@ -48,7 +48,7 @@ class phpbb_profile_custom_test extends phpbb_database_test_case
|
||||||
);
|
);
|
||||||
|
|
||||||
$cp = new custom_profile;
|
$cp = new custom_profile;
|
||||||
$result = $cp->validate_profile_field(FIELD_DROPDOWN, &$field_value, $field_data);
|
$result = $cp->validate_profile_field(FIELD_DROPDOWN, $field_value, $field_data);
|
||||||
|
|
||||||
$this->assertEquals($expected, $result, $description);
|
$this->assertEquals($expected, $result, $description);
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,7 +102,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
|
||||||
foreach ($tests as $test)
|
foreach ($tests as $test)
|
||||||
{
|
{
|
||||||
$utf_result = $utf_expected;
|
$utf_result = $utf_expected;
|
||||||
call_user_func(array('utf_normalizer', $form), &$utf_result);
|
call_user_func(array('utf_normalizer', $form), $utf_result);
|
||||||
|
|
||||||
$hex_result = $this->utf_to_hexseq($utf_result);
|
$hex_result = $this->utf_to_hexseq($utf_result);
|
||||||
$this->assertEquals($utf_expected, $utf_result, "$expected == $form($test) ($hex_expected != $hex_result)");
|
$this->assertEquals($utf_expected, $utf_result, "$expected == $form($test) ($hex_expected != $hex_result)");
|
||||||
|
@ -154,7 +154,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
|
||||||
foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
|
foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
|
||||||
{
|
{
|
||||||
$utf_result = $utf_expected;
|
$utf_result = $utf_expected;
|
||||||
call_user_func(array('utf_normalizer', $form), &$utf_result);
|
call_user_func(array('utf_normalizer', $form), $utf_result);
|
||||||
$hex_result = $this->utf_to_hexseq($utf_result);
|
$hex_result = $this->utf_to_hexseq($utf_result);
|
||||||
|
|
||||||
$this->assertEquals($utf_expected, $utf_result, "$hex_expected == $form($hex_tested) ($hex_expected != $hex_result)");
|
$this->assertEquals($utf_expected, $utf_result, "$hex_expected == $form($hex_tested) ($hex_expected != $hex_result)");
|
||||||
|
|
Loading…
Add table
Reference in a new issue