Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78473: odbc_close() closes arbitrary resources

diff --cc ext/odbc/php_odbc.c
Simple merge

diff --cc ext/odbc/tests/bug78473.phpt
index 0000000000000000000000000000000000000000,fd73b6cc07225d35ae1877f84721b9f1c0827cf1..c595d51fad1e80fa4b1819aa2cd4e6c682e0ac16
mode 000000,100644..100644
--- /dev/null
--- 2/ext/odbc/tests/bug78473.phpt
+++ b/ext/odbc/tests/bug78473.phpt
@@@ -1,0 -1,14 +1,18 @@@
 -odbc_close(STDIN);
+ --TEST--
+ Bug #78473 (odbc_close() closes arbitrary resources)
+ --SKIPIF--
+ <?php
+ if (!extension_loaded('odbc')) die('skip odbc extension not available');
+ ?>
+ --FILE--
+ <?php
 -Warning: odbc_close(): supplied resource is not a valid ODBC-Link resource in %s on line %d
++try {
++    odbc_close(STDIN);
++} catch (TypeError $err) {
++    echo $err->getMessage(), PHP_EOL;
++}
+ var_dump(STDIN);
+ ?>
+ --EXPECTF--
++odbc_close(): supplied resource is not a valid ODBC-Link resource
+ resource(%d) of type (stream)