Merge branch 'PHP-8.1'

* PHP-8.1:
  Fix ODBC test which may not properly clean up

Author: cmb69

ext/odbc/tests/odbc_exec_002.phpt

@@ -23,11 +23,13 @@ $res = odbc_exec($conn, 'SELECT * FROM FOO');
 var_dump(odbc_fetch_row($res));
 var_dump(odbc_result($res, 'test'));
 var_dump(odbc_fetch_array($res));
-
+?>
+--CLEAN--
+<?php
+require 'config.inc';
+$conn = odbc_connect($dsn, $user, $pass);
 odbc_exec($conn, 'DROP TABLE FOO');
-
 odbc_exec($conn, 'DROP DATABASE odbcTEST');
-
 ?>
 --EXPECT--
 bool(true)

ext/odbc/tests/odbc_free_result_001.phpt

@@ -39,11 +39,13 @@ try {
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
-
+?>
+--CLEAN--
+<?php
+require 'config.inc';
+$conn = odbc_connect($dsn, $user, $pass);
 odbc_exec($conn, 'DROP TABLE FOO');
-
 odbc_exec($conn, 'DROP DATABASE odbcTEST');
-
 ?>
 --EXPECT--
 bool(true)