Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix ODBC test which may not properly clean up
This commit is contained in:
Christoph M. Becker 2022-01-07 19:25:23 +01:00
commit 0a9f552911
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 10 additions and 6 deletions

View file

@ -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)

View file

@ -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)