diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-12 13:08:13 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-12 13:08:13 +0200 |
| commit | 8ed3b74a0cc0a683a7db986e9a5657d34d41d94b (patch) | |
| tree | e7a8ee730e69a6a01042132d07351259f8ec8a07 /ext/pdo_pgsql | |
| parent | 354a1c27aad72b77d91bc130716c0c3bd4617463 (diff) | |
| parent | d07a6fdedfa3d894024f33431cad10d6c64d428f (diff) | |
| download | php-git-8ed3b74a0cc0a683a7db986e9a5657d34d41d94b.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests wrt. internationalization
Diffstat (limited to 'ext/pdo_pgsql')
| -rw-r--r-- | ext/pdo_pgsql/tests/bug_33876.phpt | 6 | ||||
| -rw-r--r-- | ext/pdo_pgsql/tests/copy_from.phpt | 4 | ||||
| -rw-r--r-- | ext/pdo_pgsql/tests/copy_to.phpt | 4 |
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 |