Merge branch 'PHP-7.4'

php · Feb 20, 2019 · 47e6892 · 47e6892
2 parents 35b502c + 7317de5
commit 47e6892
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ext/oci8/tests/password_new.phpt b/ext/oci8/tests/password_new.phpt
@@ -2,8 +2,8 @@
 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 --git a/ext/oci8/tests/password_old.phpt b/ext/oci8/tests/password_old.phpt
@@ -2,8 +2,8 @@
 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");