diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-09-27 20:24:24 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-09-27 20:24:24 +0200 |
| commit | 9e35eb2e1f5a6616e040402df660da636074906a (patch) | |
| tree | 5ca2dd6a7b7f0b13461bbb264d5e555cbcbbffc6 /tests | |
| parent | af66fbb93b2ca3091d2d10270c2bcc65c522b89d (diff) | |
| parent | 13b718e7206a7f78b8c108e2f55bd3056cbab130 (diff) | |
| download | forums-9e35eb2e1f5a6616e040402df660da636074906a.tar forums-9e35eb2e1f5a6616e040402df660da636074906a.tar.gz forums-9e35eb2e1f5a6616e040402df660da636074906a.tar.bz2 forums-9e35eb2e1f5a6616e040402df660da636074906a.tar.xz forums-9e35eb2e1f5a6616e040402df660da636074906a.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/profile/custom_test.php | 2 | ||||
| -rw-r--r-- | tests/utf/normalizer_test.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/profile/custom_test.php b/tests/profile/custom_test.php index 0e0a851243..585182e583 100644 --- a/tests/profile/custom_test.php +++ b/tests/profile/custom_test.php @@ -48,7 +48,7 @@ class phpbb_profile_custom_test extends phpbb_database_test_case ); $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); } diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php index a0ba470416..f8f2467082 100644 --- a/tests/utf/normalizer_test.php +++ b/tests/utf/normalizer_test.php @@ -102,7 +102,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case foreach ($tests as $test) { $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); $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) { $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); $this->assertEquals($utf_expected, $utf_result, "$hex_expected == $form($hex_tested) ($hex_expected != $hex_result)"); |