Merge branch 'PHP-7.2'

Author: nikic

ext/intl/breakiterator/breakiterator_methods.cpp

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

ext/intl/tests/breakiter_factories_basic.phpt

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

ext/intl/tests/breakiter_factories_error.phpt

@@ -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
 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
 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
 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
 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
 NULL