mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-18 06:21:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2' into PHP-7.3

Browse Source 
* PHP-7.2:
  Fix tests wrt. internationalization
This commit is contained in:
Christoph M. Becker 2019-04-12 13:08:13 +02:00
commit 8ed3b74a0c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/pdo_pgsql/tests/bug_33876.phpt
View File

@ -88,7 +88,7 @@ if (!$res->execute(array(false))) {
} else {
print_r($res->fetchAll(PDO::FETCH_ASSOC));
}
--EXPECT--
--EXPECTF--
Array
(
[0] => Array
@ -117,7 +117,7 @@ Array
(
[0] => 22P02
[1] => 7
[2] => ERROR: invalid input syntax for type boolean: ""
[2] => %s: %sboolean%s
)
EMUL
Array
@ -148,5 +148,5 @@ Array
(
[0] => 22P02
[1] => 7
[2] => ERROR: invalid input syntax for type boolean: ""
[2] => %s: %sboolean%s
)

4
ext/pdo_pgsql/tests/copy_from.phpt
View File

@ -259,7 +259,7 @@ array(6) {
NULL
}
Testing pgsqlCopyFromArray() with error
Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %s "test_error" %s
Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %stest_error%s
Testing pgsqlCopyFromFile() with default parameters
bool(true)
array(6) {
@ -393,6 +393,6 @@ array(6) {
NULL
}
Testing pgsqlCopyFromFile() with error
Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %s "test_error" %s
Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %stest_error%s
Testing pgsqlCopyFromFile() with non existing file
Exception: SQLSTATE[HY000]: General error: 7 Unable to open the file

4
ext/pdo_pgsql/tests/copy_to.phpt
View File

@ -116,7 +116,7 @@ array(3) {
"
}
Testing pgsqlCopyToArray() with error
Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %s "test_error" %s
Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %stest_error%s
Testing pgsqlCopyToFile() with default parameters
bool(true)
0 test insert 0 \N
@ -133,6 +133,6 @@ bool(true)
1;NULL
2;NULL
Testing pgsqlCopyToFile() with error
Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %s "test_error" %s
Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %stest_error%s
Testing pgsqlCopyToFile() to unwritable file
Exception: SQLSTATE[HY000]: General error: 7 Unable to open the file for writing