]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-8.0'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 10 Feb 2021 14:33:25 +0000 (15:33 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 10 Feb 2021 14:33:25 +0000 (15:33 +0100)
* PHP-8.0:
  Make mysqli_ssl_set() arguments nullable

1  2 
ext/mysqli/mysqli.stub.php
ext/mysqli/mysqli_api.c
ext/mysqli/mysqli_arginfo.h

Simple merge
Simple merge
index 16d020ddd836586365121fff869e46216abf4929,c9f203a559698593394170ed911a8919da93ee21..e3db6e98d272d9b9ca33d4ec6eb91abde085d143
@@@ -1,5 -1,5 +1,5 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: a41875cecd71e72e1c1d3fc9c4d1442a65cd2d15 */
 - * Stub hash: 36c7ee22aa4c5bb5e0174031a3defcaaadde0dbd */
++ * Stub hash: cd44441ccae3d04e4691e0b1b040cafd8db8b521 */
  
  ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
        ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)