Merge branch 'PHP-7.3' into PHP-7.4

diff --cc ext/oci8/tests/password_new.phpt
index 2726530a0ab076605d34c459151fa5e6d83bd18a,9977b10a7bccbfa48e4d5f8113102a46e08767eb..f7abc36575b7f292377e86ca406064b38b9c88bd
--- 1/ext/oci8/tests/password_new.phpt
--- 2/ext/oci8/tests/password_new.phpt
+++ b/ext/oci8/tests/password_new.phpt
@@@ -2,8 -2,8 +2,9 @@@
  oci_password_change()
  --SKIPIF--
  <?php
 +if (!extension_loaded('oci8')) die("skip no oci8 extension");
  $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on thes
+ require(dirname(__FILE__).'/skipif.inc');
  require(dirname(__FILE__).'/connect.inc');
  if (empty($dbase)) die ("skip requires database connection string be set");
  if ($test_drcp) die("skip password change not supported in DRCP Mode");

diff --cc ext/oci8/tests/password_old.phpt
index d107a6beb063e55c0f3323fab232ec7b9c5a8e4e,b2365292a4856aef30a1a2ffa1298ad8ad939ff9..bb0ed50c5ba3353cf91670e59a92fe72728f6130
--- 1/ext/oci8/tests/password_old.phpt
--- 2/ext/oci8/tests/password_old.phpt
+++ b/ext/oci8/tests/password_old.phpt
@@@ -2,8 -2,8 +2,9 @@@
  ocipasswordchange()
  --SKIPIF--
  <?php
 +if (!extension_loaded('oci8')) die("skip no oci8 extension");
  $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on thes
+ require(dirname(__FILE__).'/skipif.inc');
  require(dirname(__FILE__).'/connect.inc');
  if (empty($dbase)) die ("skip requires database connection string be set");
  if ($test_drcp) die("skip password change not supported in DRCP Mode");