php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 22:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2' into PHP-7.3

Browse Source
This commit is contained in:
Christopher Jones
2018-09-24 17:02:36 +10:00
parent f291a36659 d7b060e995
commit 28ecd4e1c7
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/oci8/tests/bug51291_1.phpt
View File

@@ -167,7 +167,7 @@ array(4) {
Test 2 - Parse
Warning: oci_error() expects parameter 1 to be resource, bool 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, bool 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"]=>

4
ext/oci8/tests/lob_002.phpt
View File

@@ -62,13 +62,13 @@ object(OCI-Lob)#%d (1) {
}
int(0)
Warning: OCI-Lob::write() expects parameter 2 to be int, 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 int, 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)

2
ext/oci8/tests/lob_026.phpt
View File

@@ -73,7 +73,7 @@ NULL
bool(true)
int(3)
Warning: oci_lob_seek() expects parameter 1 to be OCI-Lob, int 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) {

2
ext/oci8/tests/privileged_connect.phpt
View File

@@ -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 int, 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

2
ext/oci8/tests/privileged_connect1.phpt
View File

@@ -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 int, 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