[pull] master from php:master

ext/curl/config.w32

@@ -8,8 +8,7 @@ if (PHP_CURL != "no") {
 		SETUP_OPENSSL("curl", PHP_CURL) >= 2 &&
 		CHECK_LIB("winmm.lib", "curl", PHP_CURL) &&
 		CHECK_LIB("wldap32.lib", "curl", PHP_CURL) &&
-		(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) ||
-			(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
+		SETUP_ZLIB_LIB("curl", PHP_CURL) &&
 		(CHECK_LIB("normaliz.lib", "curl", PHP_CURL) &&
 		 CHECK_LIB("libssh2.lib", "curl", PHP_CURL) &&
 		 CHECK_LIB("nghttp2.lib", "curl", PHP_CURL))

ext/gd/config.w32

@@ -16,8 +16,8 @@ if (PHP_GD != "no") {
 		CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + PHP_PHP_BUILD + "\\include\\libpng12")) &&
 		(CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
 		 CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) &&
-		(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) ||
-			(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
+		SETUP_ZLIB_LIB("gd", PHP_GD) &&
+		CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects)
 		) {
 
 		if (CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) &&

ext/gmp/gmp.c

@@ -96,7 +96,7 @@ PHP_GMP_API zend_class_entry *php_gmp_class_entry(void) {
 	((__GNU_MP_VERSION >= 6) || (__GNU_MP_VERSION >= 5 && __GNU_MP_VERSION_MINOR >= 1))
 
 #define IS_GMP(zval) \
-	(Z_TYPE_P(zval) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zval), gmp_ce))
+	(Z_TYPE_P(zval) == IS_OBJECT && Z_OBJCE_P(zval) == gmp_ce)
 
 #define GET_GMP_OBJECT_FROM_OBJ(obj) \
 	php_gmp_object_from_zend_object(obj)
@@ -116,7 +116,7 @@ static bool gmp_zend_parse_arg_into_mpz_ex(
 	bool is_operator
 ) {
 	if (EXPECTED(Z_TYPE_P(arg) == IS_OBJECT)) {
-		if (EXPECTED(instanceof_function(Z_OBJCE_P(arg), gmp_ce))) {
+		if (EXPECTED(Z_OBJCE_P(arg) == gmp_ce)) {
 			*destination_mpz_ptr = GET_GMP_FROM_ZVAL(arg);
 			return true;
 		}
@@ -404,7 +404,7 @@ typeof_op_failure: ;
 
 static zend_result gmp_do_operation_ex(uint8_t opcode, zval *result, zval *op1, zval *op2) /* {{{ */
 {
-	mpz_ptr gmp_op1, gmp_result;
+	mpz_ptr gmp_result;
 	switch (opcode) {
 	case ZEND_ADD:
 		return binop_operator_helper(mpz_add, result, op1, op2);
@@ -429,11 +429,9 @@ static zend_result gmp_do_operation_ex(uint8_t opcode, zval *result, zval *op1,
 	case ZEND_BW_XOR:
 		return binop_operator_helper(mpz_xor, result, op1, op2);
 	case ZEND_BW_NOT: {
-		if (!gmp_zend_parse_arg_into_mpz_ex(op1, &gmp_op1, 1, false)) {
-			return FAILURE;
-		}
+		ZEND_ASSERT(Z_TYPE_P(op1) == IS_OBJECT && Z_OBJCE_P(op1) == gmp_ce);
 		gmp_create(result, &gmp_result);
-		mpz_com(gmp_result, gmp_op1);
+		mpz_com(gmp_result, GET_GMP_FROM_ZVAL(op1));
 		return SUCCESS;
 	}
 

ext/gmp/tests/gmp_pow.phpt

@@ -2,8 +2,6 @@
 gmp_pow() basic tests
 --EXTENSIONS--
 gmp
---SKIPIF--
-<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
 --FILE--
 <?php
 

ext/mysqlnd/config.w32

@@ -28,12 +28,9 @@ if (PHP_MYSQLND != "no") {
 			"mysqlnd_wireprotocol.c " +
 			"php_mysqlnd.c ";
 		EXTENSION("mysqlnd", mysqlnd_source, false, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
-		if ((((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "mysqlnd", PHP_MYSQLND))) ||
-			(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND)) ||
-			(PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
+		if (SETUP_ZLIB_LIB("mysqlnd", PHP_MYSQLND) &&
 			CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects)
-			)
-		{
+		) {
 			AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Define to 1 if mysqlnd has compressed protocol support.");
 			AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "Define to 1 if mysqlnd core SSL is enabled.");
 			if (CHECK_LIB("crypt32.lib", "mysqlnd")) {

ext/odbc/odbc.stub.php

@@ -351,18 +351,15 @@ function odbc_exec(Odbc\Connection $odbc, string $query): Odbc\Result|false {}
     function odbc_do(Odbc\Connection $odbc, string $query): Odbc\Result|false {}
 
 #ifdef PHP_ODBC_HAVE_FETCH_HASH
-    /** @param resource $statement */
-    function odbc_fetch_object($statement, ?int $row = null): stdClass|false {}
+    function odbc_fetch_object(Odbc\Result $statement, ?int $row = null): stdClass|false {}
 
-    /** @param resource $statement */
-    function odbc_fetch_array($statement, ?int $row = null): array|false {}
+    function odbc_fetch_array(Odbc\Result $statement, ?int $row = null): array|false {}
 #endif
 
     /**
-     * @param resource $statement
      * @param array $array
      */
-    function odbc_fetch_into($statement, &$array, ?int $row = null): int|false {}
+    function odbc_fetch_into(Odbc\Result $statement, &$array, ?int $row = null): int|false {}
 
     function odbc_fetch_row(Odbc\Result $statement, ?int $row = null): bool {}
 

win32/build/confutils.js

@@ -3626,6 +3626,11 @@ function ADD_MAKEFILE_FRAGMENT(src_file)
 	}
 }
 
+function SETUP_ZLIB_LIB(target, path_to_check)
+{
+	return (PHP_ZLIB != "no" && !PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib;zlib.lib", target, path_to_check);
+}
+
 function SETUP_OPENSSL(target, path_to_check, common_name, use_env, add_dir_part, add_to_flag_only)
 {
 	var ret = 0;