summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2017-10-25 21:00:03 +0100
committerJoe Watkins <krakjoe@php.net>2017-10-25 21:00:03 +0100
commit25a3ebdc73f8b684dcf5fc16ffcd881ddee995a5 (patch)
tree24eee04c67ce9338cf2efd49e641833093d929b0
parent777e18944565949a8e89f07936fed7fcf21b79eb (diff)
parent5e9f7f619e64d1032ea615fc2e775e595b98fdb6 (diff)
downloadphp-git-25a3ebdc73f8b684dcf5fc16ffcd881ddee995a5.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Fix typo in comments
-rw-r--r--ext/intl/uchar/uchar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c
index 1e0041f03c..1add74b2b5 100644
--- a/ext/intl/uchar/uchar.c
+++ b/ext/intl/uchar/uchar.c
@@ -141,7 +141,7 @@ IC_METHOD(getIntPropertyMinValue) {
}
/* }}} */
-/* {{{ proto int IntlChar::getIntPropertyMxValue(int $property) */
+/* {{{ proto int IntlChar::getIntPropertyMaxValue(int $property) */
ZEND_BEGIN_ARG_INFO_EX(getIntPropertyMaxValue_arginfo, 0, ZEND_RETURN_VALUE, 1)
ZEND_ARG_INFO(0, property)
ZEND_END_ARG_INFO();
@@ -188,7 +188,7 @@ static UBool enumCharType_callback(enumCharType_data *context,
zval args[3];
ZVAL_NULL(&retval);
- /* Note that $start is INclusive, whiel $limit is EXclusive
+ /* Note that $start is INclusive, while $limit is EXclusive
* Therefore (0, 32, 15) means CPs 0..31 are of type 15
*/
ZVAL_LONG(&args[0], start);