summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-04-12 13:05:16 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2019-04-12 13:07:39 +0200
commitd07a6fdedfa3d894024f33431cad10d6c64d428f (patch)
treef43e816858db9d4d10fe59239d05e5cbb24e5d62
parent3b53d28e607ba60e8a25b1fca8317565eab28b77 (diff)
downloadphp-git-d07a6fdedfa3d894024f33431cad10d6c64d428f.tar.gz
Fix tests wrt. internationalization
-rw-r--r--ext/pdo_pgsql/tests/bug_33876.phpt6
-rw-r--r--ext/pdo_pgsql/tests/copy_from.phpt4
-rw-r--r--ext/pdo_pgsql/tests/copy_to.phpt4
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/pdo_pgsql/tests/bug_33876.phpt b/ext/pdo_pgsql/tests/bug_33876.phpt
index 31a76c9a63..45c65c6663 100644
--- a/ext/pdo_pgsql/tests/bug_33876.phpt
+++ b/ext/pdo_pgsql/tests/bug_33876.phpt
@@ -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
)
diff --git a/ext/pdo_pgsql/tests/copy_from.phpt b/ext/pdo_pgsql/tests/copy_from.phpt
index 15eea01229..ba48114547 100644
--- a/ext/pdo_pgsql/tests/copy_from.phpt
+++ b/ext/pdo_pgsql/tests/copy_from.phpt
@@ -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
diff --git a/ext/pdo_pgsql/tests/copy_to.phpt b/ext/pdo_pgsql/tests/copy_to.phpt
index 4ddce526bd..cbcb49cd2d 100644
--- a/ext/pdo_pgsql/tests/copy_to.phpt
+++ b/ext/pdo_pgsql/tests/copy_to.phpt
@@ -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