]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-8.0'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 11 Feb 2021 09:23:09 +0000 (10:23 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 11 Feb 2021 09:23:09 +0000 (10:23 +0100)
* PHP-8.0:
  Don't return null from password_get_info()

1  2 
ext/standard/basic_functions.stub.php
ext/standard/basic_functions_arginfo.h
ext/standard/password.c

Simple merge
index 5eafa59b50bd7667f8dfecc06c49632aaa78034c,801fb2bcb170857726ba74434658382c7af7966b..514a0338d574504132e0c311a60b9e20aead4338
@@@ -1,5 -1,5 +1,5 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: 7540039937587f05584660bc1a1a8a80aa5ccbd1 */
 - * Stub hash: 39cd1ddd82efd6b62605218faff8b720d8b97170 */
++ * Stub hash: 4f4ed195a688735d48aeb3b7cd390d8463a07c26 */
  
  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)
Simple merge