Merge branch 'PHP-8.2' into PHP-8.3

cmb69 · cmb69 · commit e811bff3bbbe · 2024-08-06T16:54:58.000+02:00
* PHP-8.2:
  Fix odbc_data_source_001.phpt
diff --git a/ext/odbc/tests/odbc_data_source_001.phpt b/ext/odbc/tests/odbc_data_source_001.phpt
@@ -17,7 +17,7 @@ include 'config.inc';
 $conn = odbc_connect($dsn, $user, $pass);
 
 try {
-    var_dump(odbc_data_source($conn, NULL));
+    var_dump(odbc_data_source($conn, SQL_FETCH_FIRST + SQL_FETCH_NEXT));
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ include 'config.inc';`
`17`	`17`	`$conn = odbc_connect($dsn, $user, $pass);`
`18`	`18`
`19`	`19`	`try {`
`20`		`- var_dump(odbc_data_source($conn, NULL));`
	`20`	`+ var_dump(odbc_data_source($conn, SQL_FETCH_FIRST + SQL_FETCH_NEXT));`
`21`	`21`	`} catch (\ValueError $e) {`
`22`	`22`	`echo $e->getMessage() . \PHP_EOL;`
`23`	`23`	`}`