archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.2'

Browse source
This commit is contained in:
Nikita Popov 2018-06-13 23:48:37 +02:00
commit bc56bb847d
3 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/intl/breakiterator/breakiterator_methods.cpp
View file

@ -53,7 +53,7 @@ static void _breakiter_factory(const char *func_name,
UErrorCode status = UErrorCode(); UErrorCode status = UErrorCode();
intl_error_reset(NULL); intl_error_reset(NULL);
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!", if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!",
&locale_str, &dummy) == FAILURE) { &locale_str, &dummy) == FAILURE) {
spprintf(&msg, 0, "%s: bad arguments", func_name); spprintf(&msg, 0, "%s: bad arguments", func_name);
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1); intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1);

16
ext/intl/tests/breakiter_factories_basic.phpt
View file

@ -12,35 +12,29 @@ ini_set("intl.default_locale", "ja");
$m = array('createWordInstance', 'createLineInstance', 'createCharacterInstance', $m = array('createWordInstance', 'createLineInstance', 'createCharacterInstance',
'createSentenceInstance', 'createTitleInstance'); 'createSentenceInstance', 'createTitleInstance');
$t = 'Frase 1... Frase 2'. $t = 'Frase 1... Frase 2';
$o1 = $o2 = null;
foreach ($m as $method) { foreach ($m as $method) {
echo "===== $method =====\n"; echo "===== $method =====\n";
$o1 = call_user_func(array('IntlBreakIterator', $method), 'ja'); $o1 = IntlBreakIterator::$method('ja');
var_dump($o1 == $o2); $o2 = IntlBreakIterator::$method(NULL);
$o2 = call_user_func(array('IntlBreakIterator', $method), NULL); $o3 = IntlBreakIterator::$method();
var_dump($o1 == $o2); var_dump($o1 == $o2 && $o2 == $o3);
echo "\n"; echo "\n";
} }
--EXPECT-- --EXPECT--
===== createWordInstance ===== ===== createWordInstance =====
bool(false)
bool(true) bool(true)
===== createLineInstance ===== ===== createLineInstance =====
bool(false)
bool(true) bool(true)
===== createCharacterInstance ===== ===== createCharacterInstance =====
bool(false)
bool(true) bool(true)
===== createSentenceInstance ===== ===== createSentenceInstance =====
bool(false)
bool(true) bool(true)
===== createTitleInstance ===== ===== createTitleInstance =====
bool(false)
bool(true) bool(true)

8
ext/intl/tests/breakiter_factories_error.phpt
View file

@ -22,22 +22,22 @@ Warning: IntlBreakIterator::createWordInstance() expects parameter 1 to be strin
Warning: IntlBreakIterator::createWordInstance(): breakiter_create_word_instance: bad arguments in %s on line %d Warning: IntlBreakIterator::createWordInstance(): breakiter_create_word_instance: bad arguments in %s on line %d
NULL NULL
Warning: IntlBreakIterator::createSentenceInstance() expects exactly 1 parameter, 2 given in %s on line %d Warning: IntlBreakIterator::createSentenceInstance() expects at most 1 parameter, 2 given in %s on line %d
Warning: IntlBreakIterator::createSentenceInstance(): breakiter_create_sentence_instance: bad arguments in %s on line %d Warning: IntlBreakIterator::createSentenceInstance(): breakiter_create_sentence_instance: bad arguments in %s on line %d
NULL NULL
Warning: IntlBreakIterator::createCharacterInstance() expects exactly 1 parameter, 2 given in %s on line %d Warning: IntlBreakIterator::createCharacterInstance() expects at most 1 parameter, 2 given in %s on line %d
Warning: IntlBreakIterator::createCharacterInstance(): breakiter_create_character_instance: bad arguments in %s on line %d Warning: IntlBreakIterator::createCharacterInstance(): breakiter_create_character_instance: bad arguments in %s on line %d
NULL NULL
Warning: IntlBreakIterator::createTitleInstance() expects exactly 1 parameter, 2 given in %s on line %d Warning: IntlBreakIterator::createTitleInstance() expects at most 1 parameter, 2 given in %s on line %d
Warning: IntlBreakIterator::createTitleInstance(): breakiter_create_title_instance: bad arguments in %s on line %d Warning: IntlBreakIterator::createTitleInstance(): breakiter_create_title_instance: bad arguments in %s on line %d
NULL NULL
Warning: IntlBreakIterator::createLineInstance() expects exactly 1 parameter, 2 given in %s on line %d Warning: IntlBreakIterator::createLineInstance() expects at most 1 parameter, 2 given in %s on line %d
Warning: IntlBreakIterator::createLineInstance(): breakiter_create_line_instance: bad arguments in %s on line %d Warning: IntlBreakIterator::createLineInstance(): breakiter_create_line_instance: bad arguments in %s on line %d
NULL NULL