From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 31 May 2019 13:40:04 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f20b2c71e52d68ccf757daf01b4f8f19fd322cea;p=php

Merge branch 'PHP-7.4'
---

f20b2c71e52d68ccf757daf01b4f8f19fd322cea
diff --cc ext/intl/locale/locale_methods.c
index 20a156af91,4c5476f6aa..17474df035
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@@ -1514,8 -1538,9 +1514,8 @@@ PHP_FUNCTION(locale_lookup
  
  	intl_error_reset( NULL );
  
- 	if(zend_parse_parameters( ZEND_NUM_ARGS(), "as|bS", &arr, &loc_range, &loc_range_len,
+ 	if(zend_parse_parameters( ZEND_NUM_ARGS(), "as|bS!", &arr, &loc_range, &loc_range_len,
  		&boolCanonical,	&fallback_loc_str) == FAILURE) {
 -		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,	"locale_lookup: unable to parse input params", 0 );
  		RETURN_FALSE;
  	}