[pull] master from php:master

NEWS

@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.5.0beta2
 
+- ODBC:
+  . Remove ODBCVER and assume ODBC 3.5. (Calvin Buckley)
+
 - OpenSSL:
   . Implement #81724 (openssl_cms_encrypt only allows specific ciphers).
     (Jakub Zelenka)

UPGRADING

@@ -80,6 +80,10 @@ PHP 8.5 UPGRADE NOTES
   . Calling the mysqli constructor on an already-constructed object
     is now no longer possible and throws an Error.
 
+- ODBC:
+  . ODBC now assumes that at least ODBC 3.5 functionality is available. The
+    ODBCVER definition and build system flags to control it have been removed.
+
 - Opcache:
   . The Opcache extension is now always built into the PHP binary and is always
     loaded. The INI directives opcache.enable and opcache.enable_cli are still
@@ -268,8 +272,6 @@ PHP 8.5 UPGRADE NOTES
     and the function returns false. Previously, these errors were silently
     ignored. This change affects only the sendmail transport.
   . getimagesize() now supports HEIF/HEIC images.
-
-- Standard:
   . getimagesize() now supports SVG images when ext-libxml is also loaded.
     Similarly, image_type_to_extension() and image_type_to_mime_type()
     now also handle IMAGETYPE_SVG.

ext/iconv/iconv.c

@@ -2571,7 +2571,6 @@ static const php_stream_filter_ops php_iconv_stream_filter_ops = {
 /* {{{ php_iconv_stream_filter_create */
 static php_stream_filter *php_iconv_stream_filter_factory_create(const char *name, zval *params, uint8_t persistent)
 {
-	php_stream_filter *retval = NULL;
 	php_iconv_stream_filter *inst;
 	const char *from_charset = NULL, *to_charset = NULL;
 	size_t from_charset_len, to_charset_len;
@@ -2602,12 +2601,7 @@ static php_stream_filter *php_iconv_stream_filter_factory_create(const char *nam
 		return NULL;
 	}
 
-	if (NULL == (retval = php_stream_filter_alloc(&php_iconv_stream_filter_ops, inst, persistent))) {
-		php_iconv_stream_filter_dtor(inst);
-		pefree(inst, persistent);
-	}
-
-	return retval;
+	return php_stream_filter_alloc(&php_iconv_stream_filter_ops, inst, persistent);
 }
 /* }}} */
 

ext/odbc/config.m4

@@ -106,13 +106,6 @@ dnl
 dnl configure options
 dnl
 
-PHP_ARG_WITH([odbcver],,
-  [AS_HELP_STRING([[--with-odbcver[=HEX]]],
-    [Force support for the passed ODBC version. A hex number is expected,
-    default 0x0350. Use the special value of 0 to prevent an explicit ODBCVER to
-    be defined.])],
-  [0x0350])
-
 AS_VAR_IF([ODBC_TYPE],, [
 PHP_ARG_WITH([adabas],
   [for Adabas support],
@@ -410,12 +403,6 @@ PHP_ARG_WITH([dbmaker],
   ])
 ])
 
-AH_TEMPLATE([ODBCVER], [The highest supported ODBC version.])
-AS_VAR_IF([PHP_ODBCVER], [no],
-  [AC_DEFINE([ODBCVER], [0x0350])],
-  [AS_VAR_IF([PHP_ODBCVER], [0],,
-    [AC_DEFINE_UNQUOTED([ODBCVER], [$PHP_ODBCVER])])])
-
 dnl Extension setup
 if test -n "$ODBC_TYPE"; then
   AS_VAR_IF([ODBC_TYPE], [dbmaker],, [

ext/odbc/config.w32

@@ -1,7 +1,6 @@
 // vim:ft=javascript
 
 ARG_ENABLE("odbc", "ODBC support", "no");
-ARG_WITH("odbcver", "Force support for the passed ODBC version. A hex number is expected, default 0x0350. Use the special value of 0 to prevent an explicit ODBCVER to be defined.", "0x0350");
 
 if (PHP_ODBC == "yes") {
 	if (CHECK_LIB("odbc32.lib", "odbc") && CHECK_LIB("odbccp32.lib", "odbc")
@@ -10,11 +9,6 @@ if (PHP_ODBC == "yes") {
 		EXTENSION("odbc", "php_odbc.c odbc_utils.c", PHP_ODBC_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 		AC_DEFINE("HAVE_UODBC", 1, "Define to 1 if the PHP extension 'odbc' is available.");
 		AC_DEFINE("HAVE_SQLDATASOURCES", 1, "Define to 1 if ODBC library has 'SQLDataSources', as a function or macro.");
-		if ("no" == PHP_ODBCVER) {
-			AC_DEFINE("ODBCVER", "0x0350", "The highest supported ODBC version.", false);
-		} else if ("0" != PHP_ODBCVER) {
-			AC_DEFINE("ODBCVER", PHP_ODBCVER, "The highest supported ODBC version.", false);
-		}
 	} else {
 		WARNING("odbc support can't be enabled, libraries or header are missing (SDK)")
 		PHP_ODBC = "no"

ext/odbc/odbc.stub.php

@@ -233,8 +233,6 @@ class Result
      * @cvalue SQL_TIMESTAMP
      */
     const SQL_TIMESTAMP = UNKNOWN;
-
-#if (defined(ODBCVER) && (ODBCVER >= 0x0300))
     /**
      * @var int
      * @cvalue SQL_TYPE_DATE
@@ -327,8 +325,6 @@ class Result
      */
     const SQL_QUICK = UNKNOWN;
 
-#endif
-
     function odbc_close_all(): void {}
 
     function odbc_binmode(Odbc\Result $statement, int $mode): true {}