Merge branch 'PHP-8.2'

* PHP-8.2:
  Fix memory leak triggered by unsuccessful dynamic property unserialization
  Declare ext/standard constants in stubs - part 6
  Add parenthesis around preprocessor conditions in stubs

Author: kocsismate

ext/imap/php_imap.stub.php

@@ -551,7 +551,7 @@ function imap_thread(IMAP\Connection $imap, int $flags = SE_FREE): array|false {
 
     function imap_timeout(int $timeout_type, int $timeout = -1): int|bool {}
 
-    #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+    #if (defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001))
     function imap_get_quota(IMAP\Connection $imap, string $quota_root): array|false {}
 
     function imap_get_quotaroot(IMAP\Connection $imap, string $mailbox): array|false {}

ext/imap/php_imap_arginfo.h

@@ -751,7 +751,7 @@ function ldap_parse_result(LDAP\Connection $ldap, LDAP\Result $result, &$error_c
     #endif
     #endif
 
-    #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)
+    #if (defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC))
     function ldap_set_rebind_proc(LDAP\Connection $ldap, ?callable $callback): bool {}
     #endif
 

ext/ldap/ldap.stub.php

@@ -215,7 +215,7 @@
  */
 const SQL_TIMESTAMP = UNKNOWN;
 
-#if defined(ODBCVER) && (ODBCVER >= 0x0300)
+#if (defined(ODBCVER) && (ODBCVER >= 0x0300))
 /**
  * @var int
  * @cvalue SQL_TYPE_DATE

ext/ldap/ldap_arginfo.h

@@ -1588,7 +1588,7 @@
 const SOL_LOCAL = UNKNOWN;
 #endif
 
-#if defined(IPV6_RECVPKTINFO) && HAVE_IPV6
+#if (defined(IPV6_RECVPKTINFO) && HAVE_IPV6)
 /**
  * IPv6 ancillary data
  * @var int
@@ -1601,7 +1601,7 @@
  */
 const IPV6_PKTINFO = UNKNOWN;
 #endif
-#if defined(IPV6_RECVHOPLIMIT) && HAVE_IPV6
+#if (defined(IPV6_RECVHOPLIMIT) && HAVE_IPV6)
 /**
  * @var int
  * @cvalue IPV6_RECVHOPLIMIT
@@ -1614,7 +1614,7 @@
 const IPV6_HOPLIMIT = UNKNOWN;
 #endif
 
-#if defined(IPV6_RECVTCLASS) && HAVE_IPV6
+#if (defined(IPV6_RECVTCLASS) && HAVE_IPV6)
 /**
  * @var int
  * @cvalue IPV6_RECVTCLASS

ext/odbc/odbc.stub.php

@@ -21,6 +21,7 @@
 #include "php_globals.h"
 #include "php_variables.h"
 #include "php_ini.h"
+#include "php_image.h"
 #include "php_standard.h"
 #include "php_math.h"
 #include "php_http.h"
@@ -348,7 +349,6 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
 	BASIC_MINIT_SUBMODULE(exec)
 
 	BASIC_MINIT_SUBMODULE(user_streams)
-	BASIC_MINIT_SUBMODULE(imagetypes)
 
 	php_register_url_stream_wrapper("php", &php_stream_php_wrapper);
 	php_register_url_stream_wrapper("file", &php_plain_files_wrapper);