diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 826c635e6dbf..2a2fc2e4ae1e 100755 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -296,55 +296,6 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */ assertion_error_ce = register_class_AssertionError(zend_ce_error); - REGISTER_LONG_CONSTANT("CONNECTION_ABORTED", PHP_CONNECTION_ABORTED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("CONNECTION_NORMAL", PHP_CONNECTION_NORMAL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("CONNECTION_TIMEOUT", PHP_CONNECTION_TIMEOUT, CONST_CS | CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("INI_USER", ZEND_INI_USER, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INI_PERDIR", ZEND_INI_PERDIR, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INI_SYSTEM", ZEND_INI_SYSTEM, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INI_ALL", ZEND_INI_ALL, CONST_CS | CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("INI_SCANNER_NORMAL", ZEND_INI_SCANNER_NORMAL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INI_SCANNER_RAW", ZEND_INI_SCANNER_RAW, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INI_SCANNER_TYPED", ZEND_INI_SCANNER_TYPED, CONST_CS | CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("PHP_URL_SCHEME", PHP_URL_SCHEME, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_URL_HOST", PHP_URL_HOST, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_URL_PORT", PHP_URL_PORT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_URL_USER", PHP_URL_USER, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_URL_PASS", PHP_URL_PASS, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_URL_PATH", PHP_URL_PATH, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_URL_QUERY", PHP_URL_QUERY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_URL_FRAGMENT", PHP_URL_FRAGMENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_QUERY_RFC1738", PHP_QUERY_RFC1738, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_QUERY_RFC3986", PHP_QUERY_RFC3986, CONST_CS | CONST_PERSISTENT); - -#define REGISTER_MATH_CONSTANT(x) REGISTER_DOUBLE_CONSTANT(#x, x, CONST_CS | CONST_PERSISTENT) - REGISTER_MATH_CONSTANT(M_LOG2E); - REGISTER_MATH_CONSTANT(M_LOG10E); - REGISTER_MATH_CONSTANT(M_LN2); - REGISTER_MATH_CONSTANT(M_LN10); - REGISTER_MATH_CONSTANT(M_PI); - REGISTER_MATH_CONSTANT(M_PI_2); - REGISTER_MATH_CONSTANT(M_PI_4); - REGISTER_MATH_CONSTANT(M_1_PI); - REGISTER_MATH_CONSTANT(M_2_PI); - REGISTER_MATH_CONSTANT(M_SQRTPI); - REGISTER_MATH_CONSTANT(M_2_SQRTPI); - REGISTER_MATH_CONSTANT(M_LNPI); - REGISTER_MATH_CONSTANT(M_EULER); - REGISTER_MATH_CONSTANT(M_SQRT2); - REGISTER_MATH_CONSTANT(M_SQRT1_2); - REGISTER_MATH_CONSTANT(M_SQRT3); - REGISTER_DOUBLE_CONSTANT("INF", ZEND_INFINITY, CONST_CS | CONST_PERSISTENT); - REGISTER_DOUBLE_CONSTANT("NAN", ZEND_NAN, CONST_CS | CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_UP", PHP_ROUND_HALF_UP, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_DOWN", PHP_ROUND_HALF_DOWN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_EVEN", PHP_ROUND_HALF_EVEN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_ODD", PHP_ROUND_HALF_ODD, CONST_CS | CONST_PERSISTENT); - #ifdef ENABLE_TEST_CLASS test_class_startup(); #endif diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index 09a3c902dcdd..6166cf6587bb 100755 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -122,11 +122,226 @@ /* basic_functions.h */ +/** + * @var int + * @cvalue PHP_CONNECTION_ABORTED + */ +const CONNECTION_ABORTED = UNKNOWN; +/** + * @var int + * @cvalue PHP_CONNECTION_NORMAL + */ +const CONNECTION_NORMAL = UNKNOWN; +/** + * @var int + * @cvalue PHP_CONNECTION_TIMEOUT + */ +const CONNECTION_TIMEOUT = UNKNOWN; + +/** + * @var int + * @cvalue ZEND_INI_USER + */ +const INI_USER = UNKNOWN; +/** + * @var int + * @cvalue ZEND_INI_PERDIR + */ +const INI_PERDIR = UNKNOWN; +/** + * @var int + * @cvalue ZEND_INI_SYSTEM + */ +const INI_SYSTEM = UNKNOWN; +/** + * @var int + * @cvalue ZEND_INI_ALL + */ +const INI_ALL = UNKNOWN; + +/** + * @var int + * @cvalue ZEND_INI_SCANNER_NORMAL + */ +const INI_SCANNER_NORMAL = UNKNOWN; +/** + * @var int + * @cvalue ZEND_INI_SCANNER_RAW + */ +const INI_SCANNER_RAW = UNKNOWN; +/** + * @var int + * @cvalue ZEND_INI_SCANNER_TYPED + */ +const INI_SCANNER_TYPED = UNKNOWN; + +/** + * @var int + * @cvalue PHP_URL_SCHEME + */ +const PHP_URL_SCHEME = UNKNOWN; +/** + * @var int + * @cvalue PHP_URL_HOST + */ +const PHP_URL_HOST = UNKNOWN; +/** + * @var int + * @cvalue PHP_URL_PORT + */ +const PHP_URL_PORT = UNKNOWN; +/** + * @var int + * @cvalue PHP_URL_USER + */ +const PHP_URL_USER = UNKNOWN; +/** + * @var int + * @cvalue PHP_URL_PASS + */ +const PHP_URL_PASS = UNKNOWN; +/** + * @var int + * @cvalue PHP_URL_PATH + */ +const PHP_URL_PATH = UNKNOWN; +/** + * @var int + * @cvalue PHP_URL_QUERY + */ +const PHP_URL_QUERY = UNKNOWN; +/** + * @var int + * @cvalue PHP_URL_FRAGMENT + */ +const PHP_URL_FRAGMENT = UNKNOWN; +/** + * @var int + * @cvalue PHP_QUERY_RFC1738 + */ +const PHP_QUERY_RFC1738 = UNKNOWN; +/** + * @var int + * @cvalue PHP_QUERY_RFC3986 + */ +const PHP_QUERY_RFC3986 = UNKNOWN; + /** * @var float * @cvalue M_E */ const M_E = 2.718281828459045; +/** + * @var float + * @cvalue M_LOG2E + */ +const M_LOG2E = 1.4426950408889634074; +/** + * @var float + * @cvalue M_LOG10E + */ +const M_LOG10E = 0.43429448190325182765; +/** + * @var float + * @cvalue M_LN2 + */ +const M_LN2 = 0.69314718055994530942; +/** + * @var float + * @cvalue M_LN10 + */ +const M_LN10 = 2.30258509299404568402; +/** + * @var float + * @cvalue M_PI + */ +const M_PI = 3.14159265358979323846; +/** + * @var float + * @cvalue M_PI_2 + */ +const M_PI_2 = 1.57079632679489661923; +/** + * @var float + * @cvalue M_PI_4 + */ +const M_PI_4 = 0.78539816339744830962; +/** + * @var float + * @cvalue M_1_PI + */ +const M_1_PI = 0.31830988618379067154; +/** + * @var float + * @cvalue M_2_PI + */ +const M_2_PI = 0.63661977236758134308; +/** + * @var float + * @cvalue M_SQRTPI + */ +const M_SQRTPI = 1.77245385090551602729; +/** + * @var float + * @cvalue M_2_SQRTPI + */ +const M_2_SQRTPI = 1.12837916709551257390; +/** + * @var float + * @cvalue M_LNPI + */ +const M_LNPI = 1.14472988584940017414; +/** + * @var float + * @cvalue M_EULER + */ +const M_EULER = 0.57721566490153286061; +/** + * @var float + * @cvalue M_SQRT2 + */ +const M_SQRT2 = 1.41421356237309504880; +/** + * @var float + * @cvalue M_SQRT1_2 + */ +const M_SQRT1_2 = 0.70710678118654752440; +/** + * @var float + * @cvalue M_SQRT3 + */ +const M_SQRT3 = 1.73205080756887729352; +/** + * @var float + * @cvalue ZEND_INFINITY + */ +const INF = UNKNOWN; +/** + * @var float + * @cvalue ZEND_NAN + */ +const NAN = UNKNOWN; + +/** + * @var int + * @cvalue PHP_ROUND_HALF_UP + */ +const PHP_ROUND_HALF_UP = UNKNOWN; +/** + * @var int + * @cvalue PHP_ROUND_HALF_DOWN + */ +const PHP_ROUND_HALF_DOWN = UNKNOWN; +/** + * @var int + * @cvalue PHP_ROUND_HALF_EVEN + */ +const PHP_ROUND_HALF_EVEN = UNKNOWN; +/** + * @var int + * @cvalue PHP_ROUND_HALF_ODD + */ +const PHP_ROUND_HALF_ODD = UNKNOWN; final class __PHP_Incomplete_Class { diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index ef8ae6cac66c..7b01c8f7bd27 100644 --- a/ext/standard/basic_functions_arginfo.h +++ b/ext/standard/basic_functions_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 51ffd17ba03a2a419b94ef633a621dbf90eb16ee */ + * Stub hash: 0411f358f211eb9173272c6f296899d349ab5971 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0) @@ -3505,8 +3505,66 @@ static void register_basic_functions_symbols(int module_number) REGISTER_LONG_CONSTANT("COUNT_RECURSIVE", PHP_COUNT_RECURSIVE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ARRAY_FILTER_USE_BOTH", ARRAY_FILTER_USE_BOTH, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ARRAY_FILTER_USE_KEY", ARRAY_FILTER_USE_KEY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("CONNECTION_ABORTED", PHP_CONNECTION_ABORTED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("CONNECTION_NORMAL", PHP_CONNECTION_NORMAL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("CONNECTION_TIMEOUT", PHP_CONNECTION_TIMEOUT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INI_USER", ZEND_INI_USER, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INI_PERDIR", ZEND_INI_PERDIR, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INI_SYSTEM", ZEND_INI_SYSTEM, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INI_ALL", ZEND_INI_ALL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INI_SCANNER_NORMAL", ZEND_INI_SCANNER_NORMAL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INI_SCANNER_RAW", ZEND_INI_SCANNER_RAW, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INI_SCANNER_TYPED", ZEND_INI_SCANNER_TYPED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_URL_SCHEME", PHP_URL_SCHEME, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_URL_HOST", PHP_URL_HOST, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_URL_PORT", PHP_URL_PORT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_URL_USER", PHP_URL_USER, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_URL_PASS", PHP_URL_PASS, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_URL_PATH", PHP_URL_PATH, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_URL_QUERY", PHP_URL_QUERY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_URL_FRAGMENT", PHP_URL_FRAGMENT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_QUERY_RFC1738", PHP_QUERY_RFC1738, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_QUERY_RFC3986", PHP_QUERY_RFC3986, CONST_CS | CONST_PERSISTENT); REGISTER_DOUBLE_CONSTANT("M_E", M_E, CONST_CS | CONST_PERSISTENT); ZEND_ASSERT(M_E == 2.718281828459045); + REGISTER_DOUBLE_CONSTANT("M_LOG2E", M_LOG2E, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_LOG2E == 1.4426950408889634); + REGISTER_DOUBLE_CONSTANT("M_LOG10E", M_LOG10E, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_LOG10E == 0.4342944819032518); + REGISTER_DOUBLE_CONSTANT("M_LN2", M_LN2, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_LN2 == 0.6931471805599453); + REGISTER_DOUBLE_CONSTANT("M_LN10", M_LN10, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_LN10 == 2.302585092994046); + REGISTER_DOUBLE_CONSTANT("M_PI", M_PI, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_PI == 3.141592653589793); + REGISTER_DOUBLE_CONSTANT("M_PI_2", M_PI_2, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_PI_2 == 1.5707963267948966); + REGISTER_DOUBLE_CONSTANT("M_PI_4", M_PI_4, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_PI_4 == 0.7853981633974483); + REGISTER_DOUBLE_CONSTANT("M_1_PI", M_1_PI, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_1_PI == 0.3183098861837907); + REGISTER_DOUBLE_CONSTANT("M_2_PI", M_2_PI, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_2_PI == 0.6366197723675814); + REGISTER_DOUBLE_CONSTANT("M_SQRTPI", M_SQRTPI, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_SQRTPI == 1.772453850905516); + REGISTER_DOUBLE_CONSTANT("M_2_SQRTPI", M_2_SQRTPI, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_2_SQRTPI == 1.1283791670955126); + REGISTER_DOUBLE_CONSTANT("M_LNPI", M_LNPI, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_LNPI == 1.1447298858494002); + REGISTER_DOUBLE_CONSTANT("M_EULER", M_EULER, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_EULER == 0.5772156649015329); + REGISTER_DOUBLE_CONSTANT("M_SQRT2", M_SQRT2, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_SQRT2 == 1.4142135623730951); + REGISTER_DOUBLE_CONSTANT("M_SQRT1_2", M_SQRT1_2, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_SQRT1_2 == 0.7071067811865476); + REGISTER_DOUBLE_CONSTANT("M_SQRT3", M_SQRT3, CONST_CS | CONST_PERSISTENT); + ZEND_ASSERT(M_SQRT3 == 1.7320508075688772); + REGISTER_DOUBLE_CONSTANT("INF", ZEND_INFINITY, CONST_CS | CONST_PERSISTENT); + REGISTER_DOUBLE_CONSTANT("NAN", ZEND_NAN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_UP", PHP_ROUND_HALF_UP, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_DOWN", PHP_ROUND_HALF_DOWN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_EVEN", PHP_ROUND_HALF_EVEN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_ODD", PHP_ROUND_HALF_ODD, CONST_CS | CONST_PERSISTENT); zend_add_parameter_attribute(zend_hash_str_find_ptr(CG(function_table), "password_hash", sizeof("password_hash") - 1), 0, ZSTR_KNOWN(ZEND_STR_SENSITIVEPARAMETER), 0);