diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-08-31 16:11:59 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-08-31 16:11:59 +0200 |
| commit | af54b5064e163d80e6843cc0e617b09bc4607854 (patch) | |
| tree | 4fb1ff9bae0b2a0992b05e5676fc0e92cccd0f12 /php-5.4.16-pdotests.patch | |
import php54-php 5.4.16 from rhscl 1.1
Diffstat (limited to 'php-5.4.16-pdotests.patch')
| -rw-r--r-- | php-5.4.16-pdotests.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/php-5.4.16-pdotests.patch b/php-5.4.16-pdotests.patch new file mode 100644 index 0000000..7371798 --- /dev/null +++ b/php-5.4.16-pdotests.patch @@ -0,0 +1,34 @@ +From c08e1d2be948d63f7a9309344a0ed4092ac8dace Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikic@php.net> +Date: Sun, 24 Mar 2013 17:52:16 +0100 +Subject: [PATCH] Fix PDO::inTransaction() test for pgsql + +inTransaction() nowadays casts the in_transaction result to boolean. +I'm not sure whether the INERROR state should result in true or false. +For now I went with the result that we actually get. +--- + ext/pdo_pgsql/tests/is_in_transaction.phpt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ext/pdo_pgsql/tests/is_in_transaction.phpt b/ext/pdo_pgsql/tests/is_in_transaction.phpt +index 99ff561..72da4f4 100644 +--- a/ext/pdo_pgsql/tests/is_in_transaction.phpt ++++ b/ext/pdo_pgsql/tests/is_in_transaction.phpt +@@ -57,10 +57,10 @@ var_dump($db->inTransaction()); + ?> + --EXPECT-- + Test PDO::PGSQL_TRANSACTION_INTRANS +-int(2) ++bool(true) + Test PDO::PGSQL_TRANSACTION_IDLE +-int(0) ++bool(false) + Test PDO::PGSQL_TRANSACTION_INERROR +-int(3) ++bool(true) + Test PDO::PGSQL_TRANSACTION_IDLE +-int(0) ++bool(false) +-- +1.7.11.5 + |