diff options
| author | Christopher Jones <sixd@php.net> | 2018-09-24 16:02:19 +1000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2018-09-24 16:02:19 +1000 |
| commit | aae4ccb0304ee796e012b985efbf263991d08ee5 (patch) | |
| tree | e611ebcdfde72e61e0c1747f3f332782cffdff3f | |
| parent | 45ab3d3ad37d648217bb12fd59b3039781171dcd (diff) | |
| parent | d2b04c17497b8fc2880af9399a69c85ff841ce51 (diff) | |
| download | php-git-aae4ccb0304ee796e012b985efbf263991d08ee5.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | ext/oci8/tests/lob_029.phpt | 2 | ||||
| -rw-r--r-- | ext/oci8/tests/lob_null.phpt | 2 | ||||
| -rw-r--r-- | ext/oci8/tests/privileged_connect.phpt | 2 | ||||
| -rw-r--r-- | ext/oci8/tests/privileged_connect1.phpt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ext/oci8/tests/lob_029.phpt b/ext/oci8/tests/lob_029.phpt index a99dd79833..615c2722f2 100644 --- a/ext/oci8/tests/lob_029.phpt +++ b/ext/oci8/tests/lob_029.phpt @@ -89,7 +89,7 @@ oci_execute($s); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Test 1. Check how many rows in the table array(1) { ["NUMROWS"]=> diff --git a/ext/oci8/tests/lob_null.phpt b/ext/oci8/tests/lob_null.phpt index ea5c408b4a..f4dac4de7a 100644 --- a/ext/oci8/tests/lob_null.phpt +++ b/ext/oci8/tests/lob_null.phpt @@ -188,7 +188,7 @@ $s = oci_parse($c, 'drop table lob_null_tab'); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Temporary CLOB: NULL Temporary CLOB: '' Temporary CLOB: text diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt index 45e236178e..198c45c990 100644 --- a/ext/oci8/tests/privileged_connect.phpt +++ b/ext/oci8/tests/privileged_connect.phpt @@ -14,7 +14,7 @@ oci_connect("", "", "", false, "qwe"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_connect to be able to connect as SYSOPER or SYSDBA in %s on line %d Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_connect to be able to connect as SYSOPER or SYSDBA in %s on line %d diff --git a/ext/oci8/tests/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt index 849505b722..4e89d95b65 100644 --- a/ext/oci8/tests/privileged_connect1.phpt +++ b/ext/oci8/tests/privileged_connect1.phpt @@ -16,7 +16,7 @@ oci_connect("", "", "", false, "qwe"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_connect(): ORA-%d: %s in %s on line %d Warning: oci_connect(): ORA-%d: %s in %s on line %d |