mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-25 12:33:29 +01:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
This commit is contained in:
commit
8377418466
@ -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(array('utf_normalizer', $form), array(&$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(array('utf_normalizer', $form), array(&$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…
x
Reference in New Issue
Block a user