diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-05-31 16:48:33 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-05-31 16:48:33 +0800 |
| commit | 9bf3b03e731b8fa7b018fa58563766c0f22818e4 (patch) | |
| tree | 5c24cbfca11fdbc4e8ccd6b23f32dd7d5456499e /ext/pgsql/tests | |
| parent | 8539c5debf1e9b7230edbf858543da98df4247dd (diff) | |
| parent | 072bc589fc79a662a00480937d496deb1497b12e (diff) | |
| download | php-git-9bf3b03e731b8fa7b018fa58563766c0f22818e4.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Attempt to fix tests fails
Diffstat (limited to 'ext/pgsql/tests')
| -rw-r--r-- | ext/pgsql/tests/14pg_update.phpt | 3 | ||||
| -rw-r--r-- | ext/pgsql/tests/15pg_delete.phpt | 2 | ||||
| -rw-r--r-- | ext/pgsql/tests/bug46408.phpt | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ext/pgsql/tests/14pg_update.phpt b/ext/pgsql/tests/14pg_update.phpt index d804574405..843dbac957 100644 --- a/ext/pgsql/tests/14pg_update.phpt +++ b/ext/pgsql/tests/14pg_update.phpt @@ -23,4 +23,5 @@ echo "Ok\n"; ?> --EXPECT-- UPDATE "php_pgsql_test" SET "num"=1234,"str"=E'ABC',"bin"=E'XYZ' WHERE "num"=1234; -Ok
\ No newline at end of file +UPDATE "php_pgsql_test" SET "num='1234',"str='ABC',"bin='XYZ' WHERE "num='1234'; +Ok diff --git a/ext/pgsql/tests/15pg_delete.phpt b/ext/pgsql/tests/15pg_delete.phpt index 3b9f7d803c..86e8ac2cd6 100644 --- a/ext/pgsql/tests/15pg_delete.phpt +++ b/ext/pgsql/tests/15pg_delete.phpt @@ -23,5 +23,5 @@ else { ?> --EXPECT-- DELETE FROM "php_pgsql_test" WHERE "num"=1234; -DELETE FROM "php_pgsql_test" WHERE "num"='1234'; +DELETE FROM "php_pgsql_test" WHERE "num='1234'; Ok diff --git a/ext/pgsql/tests/bug46408.phpt b/ext/pgsql/tests/bug46408.phpt index bf84290907..5803347988 100644 --- a/ext/pgsql/tests/bug46408.phpt +++ b/ext/pgsql/tests/bug46408.phpt @@ -14,7 +14,7 @@ require_once('config.inc'); $dbh = pg_connect($conn_str); setlocale(LC_ALL, 'hr_HR.utf-8', 'hr_HR'); -echo 3.5.PHP_EOL; +echo 3.5 , "\n"; pg_query_params("SELECT $1::numeric", array(3.5)); pg_close($dbh); |