diff options
| author | Christopher Jones <christopher.jones@oracle.com> | 2018-12-08 20:14:35 +1100 |
|---|---|---|
| committer | Christopher Jones <christopher.jones@oracle.com> | 2018-12-08 20:14:35 +1100 |
| commit | 5f80fa0bc75c0739208578db79b71b1c985e7638 (patch) | |
| tree | 9251f9168e524897439f62209bca99cad55948be | |
| parent | c999be3fb5a7afdec1e3bc18459211ed97536821 (diff) | |
| parent | 6119d4c6707b4f2571f7966a85ccd3cb8e767714 (diff) | |
| download | php-git-5f80fa0bc75c0739208578db79b71b1c985e7638.tar.gz | |
Merge branch 'PHP-7.3'
* PHP-7.3:
Note that PECL install now works on PHP 7.3
Don't skip with 18c DB
| -rw-r--r-- | ext/oci8/package.xml | 1 | ||||
| -rw-r--r-- | ext/oci8/tests/driver_name.phpt | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index 2f2b0b1d6f..b07200ee97 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -67,6 +67,7 @@ Interoperability Support" (ID 207303.1) for details. <notes> This version is for PHP 7 only. Fixed bug #76804 (oci_pconnect with OCI_CRED_EXT not working). (KoenigsKind) +Fixed installation on 7.3. </notes> <contents> <dir name="/"> diff --git a/ext/oci8/tests/driver_name.phpt b/ext/oci8/tests/driver_name.phpt index bc42ad234d..509e5f471c 100644 --- a/ext/oci8/tests/driver_name.phpt +++ b/ext/oci8/tests/driver_name.phpt @@ -8,9 +8,9 @@ if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to if ($test_drcp) die("skip as Output might vary with DRCP"); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); -if (!(isset($matches[0]) && +if (!(isset($matches[0]) && ($matches[1] > 12 || ($matches[1] == 12 && $matches[2] == 1 && $matches[3] >= 0 - && $matches[4] >= 2) || ($matches[1] == 12 && $matches[2] > 1))) { + && $matches[4] >= 2) || ($matches[1] == 12 && $matches[2] > 1)))) { die("skip test expected to work only with Oracle 12.1.0.2 database or its later patchsets"); } @@ -57,11 +57,11 @@ function get_attr($conn) ?> --EXPECT-- **Test 1.1 - Default values for the attribute ************** -The value of DRIVER_NAME is PHP OCI8 : 2.1.8 +The value of DRIVER_NAME is PHP OCI8 : 2.1.9 ***Test 1.2 - Get the values from different connections ************** Testing with oci_pconnect() -The value of DRIVER_NAME is PHP OCI8 : 2.1.8 +The value of DRIVER_NAME is PHP OCI8 : 2.1.9 Testing with oci_new_connect() -The value of DRIVER_NAME is PHP OCI8 : 2.1.8 +The value of DRIVER_NAME is PHP OCI8 : 2.1.9 Done |