Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #70455 Missing constant: IntlChar::NO_NUMERIC_VALUE
This commit is contained in:
Anatol Belski 2016-04-08 10:03:29 +02:00
commit 00b5b3a540
2 changed files with 14 additions and 0 deletions

View file

@ -0,0 +1,13 @@
--TEST--
Bug #70455 Missing constant: IntlChar::NO_NUMERIC_VALUE
--SKIPIF--
<?php if (!extension_loaded('intl')) die("skip requires ext/intl") ?>
--FILE--
<?php
$value = IntlChar::getNumericValue("x");
var_dump($value);
var_dump($value === IntlChar::NO_NUMERIC_VALUE);
?>
--EXPECT--
float(-123456789)
bool(true)

View file

@ -737,6 +737,7 @@ int php_uchar_minit(INIT_FUNC_ARGS) {
IC_CONSTL("CODEPOINT_MAX", UCHAR_MAX_VALUE)
IC_CONSTL("FOLD_CASE_DEFAULT", U_FOLD_CASE_DEFAULT)
IC_CONSTL("FOLD_CASE_EXCLUDE_SPECIAL_I", U_FOLD_CASE_EXCLUDE_SPECIAL_I)
zend_declare_class_constant_double(ce, "NO_NUMERIC_VALUE", sizeof("NO_NUMERIC_VALUE")-1, U_NO_NUMERIC_VALUE);
/* All enums used by the uchar APIs. There are a LOT of them,
* so they're separated out into include files,