diff options
author | Stanislav Malyshev <stas@php.net> | 2014-01-25 23:26:29 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-01-25 23:26:29 -0800 |
commit | ce1e1bb5d83bd1a94f50b24ba0b884e314264fe6 (patch) | |
tree | c80a2e9a51c335e9203f4420dcf2ae0a48d7d271 /ext/pdo_pgsql | |
parent | 6fca805b3b8fefd7817da6ec08bdfa018f7acfb0 (diff) | |
parent | 4e308abf28d542de0f1251b5e5c523d4701af4b4 (diff) | |
download | php-git-ce1e1bb5d83bd1a94f50b24ba0b884e314264fe6.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test bug62479.phpt
Diffstat (limited to 'ext/pdo_pgsql')
-rw-r--r-- | ext/pdo_pgsql/tests/bug62479.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_pgsql/tests/bug62479.phpt b/ext/pdo_pgsql/tests/bug62479.phpt index 2e19f15002..a12bb8d1ff 100644 --- a/ext/pdo_pgsql/tests/bug62479.phpt +++ b/ext/pdo_pgsql/tests/bug62479.phpt @@ -30,7 +30,7 @@ $testQuery = 'SELECT 1 as verification'; // Create temp user with space in password $sql = sprintf($template, 'my password'); $pdo->query($sql); -$testConn = new PDO($_ENV['PDOTEST_DSN'], $user, "my password"); +$testConn = new PDO($conf['ENV']['PDOTEST_DSN'], $user, "my password"); $result = $testConn->query($testQuery)->fetch(); $check = $result[0]; var_dump($check); @@ -42,7 +42,7 @@ $pdo->query($dropUser); $sql = sprintf($template, "my pass''word"); $pdo->query($sql); -$testConn = new PDO($_ENV['PDOTEST_DSN'], $user, "my pass'word"); +$testConn = new PDO($conf['ENV']['PDOTEST_DSN'], $user, "my pass'word"); $result = $testConn->query($testQuery)->fetch(); $check = $result[0]; var_dump($check); |