Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test bug62479.phpt

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);