Permalink
Browse files

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
  • Loading branch information...
2 parents 76f3d08 + 86f8851 commit 8377418466f861f6b3291ae92a71821f0a0be2d6 @bantu bantu committed Sep 27, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 tests/utf/normalizer_test.php
@@ -102,7 +102,7 @@ public function test_normalizer()
foreach ($tests as $test)
{
$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);
$this->assertEquals($utf_expected, $utf_result, "$expected == $form($test) ($hex_expected != $hex_result)");
@@ -154,7 +154,7 @@ public function test_invariants(array $tested_chars)
foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
{
$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);
$this->assertEquals($utf_expected, $utf_result, "$hex_expected == $form($hex_tested) ($hex_expected != $hex_result)");

0 comments on commit 8377418

Please sign in to comment.