From: Xinchen Hui Date: Tue, 20 May 2014 03:31:39 +0000 (+0800) Subject: Revert changes to configs by accident X-Git-Tag: POST_PHPNG_MERGE~317^2~4^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d299b5092ac18e158073ac92ad606fd4858b05c;p=php Revert changes to configs by accident --- diff --git a/ext/pdo/tests/pdo_005.phpt b/ext/pdo/tests/pdo_005.phpt index cebb5873ec..c7c18a91a5 100644 --- a/ext/pdo/tests/pdo_005.phpt +++ b/ext/pdo/tests/pdo_005.phpt @@ -46,7 +46,7 @@ $stmt->execute(); var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestBase')); $stmt->execute(); -var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestDerived', array(""))); +var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestDerived', array(0))); ?> --EXPECTF-- diff --git a/ext/pdo_pgsql/tests/common.phpt b/ext/pdo_pgsql/tests/common.phpt index c5a2f2bbf3..8a21371bf9 100644 --- a/ext/pdo_pgsql/tests/common.phpt +++ b/ext/pdo_pgsql/tests/common.phpt @@ -18,7 +18,7 @@ if (false !== getenv('PDO_PGSQL_TEST_DSN')) { $config['ENV']['PDOTEST_ATTR'] = getenv('PDO_PGSQL_TEST_ATTR'); } } else { - $config['ENV']['PDOTEST_DSN'] = 'pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres'; + $config['ENV']['PDOTEST_DSN'] = 'pgsql:host=localhost port=5432 dbname=test user= password='; } return $config; diff --git a/ext/pdo_pgsql/tests/config.inc b/ext/pdo_pgsql/tests/config.inc index a86c82094f..6d616cddb5 100644 --- a/ext/pdo_pgsql/tests/config.inc +++ b/ext/pdo_pgsql/tests/config.inc @@ -6,7 +6,7 @@ if (false !== getenv('PDO_PGSQL_TEST_DSN')) { $config['ENV']['PDOTEST_ATTR'] = getenv('PDO_PGSQL_TEST_ATTR'); } } else { - $config['ENV']['PDOTEST_DSN'] = 'pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres'; + $config['ENV']['PDOTEST_DSN'] = 'pgsql:host=localhost port=5432 dbname=test user=root password='; } foreach ($config['ENV'] as $k => $v) {