diff options
| author | Christopher Jones <sixd@php.net> | 2018-09-24 17:01:20 +1000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2018-09-24 17:01:20 +1000 |
| commit | d7b060e9958dc4f232367d2570a775aa75b116b2 (patch) | |
| tree | 3f377cb9caab66b40fa4f0ccf5c09fbcdafaa3c5 | |
| parent | a370e7d0ade965a0fbd846e72ffc73a35bb6a3e2 (diff) | |
| parent | 3d497f884f90a329b576988bbb8887872520c0fe (diff) | |
| download | php-git-d7b060e9958dc4f232367d2570a775aa75b116b2.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
| -rw-r--r-- | ext/oci8/tests/bug51291_1.phpt | 4 | ||||
| -rw-r--r-- | ext/oci8/tests/lob_002.phpt | 4 | ||||
| -rw-r--r-- | ext/oci8/tests/lob_026.phpt | 2 | ||||
| -rw-r--r-- | ext/oci8/tests/privileged_connect.phpt | 2 | ||||
| -rw-r--r-- | ext/oci8/tests/privileged_connect1.phpt | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/ext/oci8/tests/bug51291_1.phpt b/ext/oci8/tests/bug51291_1.phpt index e9e409433d..4fa2e23995 100644 --- a/ext/oci8/tests/bug51291_1.phpt +++ b/ext/oci8/tests/bug51291_1.phpt @@ -167,7 +167,7 @@ array(4) { Test 2 - Parse -Warning: oci_error() expects parameter 1 to be resource, boolean given in %sbug51291_1.php on line %d +Warning: oci_error() expects parameter 1 to be resource, bool%sgiven in %sbug51291_1.php on line %d bool(false) array(4) { ["code"]=> @@ -182,7 +182,7 @@ array(4) { NULL 2nd call -Warning: oci_error() expects parameter 1 to be resource, boolean given in %sbug51291_1.php on line %d +Warning: oci_error() expects parameter 1 to be resource, bool%sgiven in %sbug51291_1.php on line %d bool(false) array(4) { ["code"]=> diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt index f2c585b817..188f83ddd3 100644 --- a/ext/oci8/tests/lob_002.phpt +++ b/ext/oci8/tests/lob_002.phpt @@ -62,13 +62,13 @@ object(OCI-Lob)#%d (1) { } int(0) -Warning: OCI-Lob::write() expects parameter 2 to be integer, string given in %slob_002.php on line %d +Warning: OCI-Lob::write() expects parameter 2 to be int%s string given in %slob_002.php on line %d NULL int(4) int(40000) int(40004) -Warning: OCI-Lob::seek() expects parameter 1 to be integer, string given in %slob_002.php on line %d +Warning: OCI-Lob::seek() expects parameter 1 to be int%s string given in %slob_002.php on line %d NULL bool(false) int(40004) diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt index 5799bc5277..42f0d8f775 100644 --- a/ext/oci8/tests/lob_026.phpt +++ b/ext/oci8/tests/lob_026.phpt @@ -73,7 +73,7 @@ NULL bool(true) int(3) -Warning: oci_lob_seek() expects parameter 1 to be OCI-Lob, integer given in %s on line %d +Warning: oci_lob_seek() expects parameter 1 to be OCI-Lob, int%sgiven in %s on line %d NULL bool(true) array(2) { diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt index 3e06283421..cb19d73907 100644 --- a/ext/oci8/tests/privileged_connect.phpt +++ b/ext/oci8/tests/privileged_connect.phpt @@ -21,5 +21,5 @@ Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_c Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d -Warning: oci_connect() expects parameter 5 to be integer, string given in %s on line %d +Warning: oci_connect() expects parameter 5 to be int%s string given in %s on line %d Done diff --git a/ext/oci8/tests/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt index d33711a91a..a4b8b76ba7 100644 --- a/ext/oci8/tests/privileged_connect1.phpt +++ b/ext/oci8/tests/privileged_connect1.phpt @@ -23,5 +23,5 @@ Warning: oci_connect(): ORA-%d: %s in %s on line %d Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d -Warning: oci_connect() expects parameter 5 to be integer, string given in %s on line %d +Warning: oci_connect() expects parameter 5 to be int%s string given in %s on line %d Done |