Skip to content

D
doctrine-dbal
Commit c66c41ed authored by Marco Pivetta's avatar Marco Pivetta
Browse files
Options

#714 - `db_type` may not be defined, and `db_name` may be invalid

parent d2db07cb
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 10 deletions
tests/Doctrine/Tests/DBAL/Driver/PDOPgSql/DriverTest.php
View file @ c66c41ed
...@@ -22,9 +22,8 @@ class DriverTest extends AbstractPostgreSQLDriverTest ...@@ -22,9 +22,8 @@ class DriverTest extends AbstractPostgreSQLDriverTest
$connection = $this->createDriver()->connect( $connection = $this->createDriver()->connect(
array( array(
'host' => $GLOBALS['db_host'], 'host' => $GLOBALS['db_host'],
'dbname' => $GLOBALS['db_name'], 'port' => $GLOBALS['db_port']
'port' => $GLOBALS['db_port']
), ),
$GLOBALS['db_username'], $GLOBALS['db_username'],
$GLOBALS['db_password'] $GLOBALS['db_password']
...@@ -43,9 +42,8 @@ class DriverTest extends AbstractPostgreSQLDriverTest ...@@ -43,9 +42,8 @@ class DriverTest extends AbstractPostgreSQLDriverTest
$connection = $this->createDriver()->connect( $connection = $this->createDriver()->connect(
array( array(
'host' => $GLOBALS['db_host'], 'host' => $GLOBALS['db_host'],
'dbname' => $GLOBALS['db_name'], 'port' => $GLOBALS['db_port']
'port' => $GLOBALS['db_port']
), ),
$GLOBALS['db_username'], $GLOBALS['db_username'],
$GLOBALS['db_password'], $GLOBALS['db_password'],
...@@ -65,9 +63,8 @@ class DriverTest extends AbstractPostgreSQLDriverTest ...@@ -65,9 +63,8 @@ class DriverTest extends AbstractPostgreSQLDriverTest
$connection = $this->createDriver()->connect( $connection = $this->createDriver()->connect(
array( array(
'host' => $GLOBALS['db_host'], 'host' => $GLOBALS['db_host'],
'dbname' => $GLOBALS['db_name'], 'port' => $GLOBALS['db_port']
'port' => $GLOBALS['db_port']
), ),
$GLOBALS['db_username'], $GLOBALS['db_username'],
$GLOBALS['db_password'], $GLOBALS['db_password'],
...@@ -95,7 +92,7 @@ class DriverTest extends AbstractPostgreSQLDriverTest ...@@ -95,7 +92,7 @@ class DriverTest extends AbstractPostgreSQLDriverTest
$this->markTestSkipped('Test requires PHP 5.6+'); $this->markTestSkipped('Test requires PHP 5.6+');
} }
if ($GLOBALS['db_type'] !== 'pdo_pgsql') { if (! (isset($GLOBALS['db_type']) && $GLOBALS['db_type'] === 'pdo_pgsql')) {
$this->markTestSkipped('Test enabled only when using pdo_pgsql specific phpunit.xml'); $this->markTestSkipped('Test enabled only when using pdo_pgsql specific phpunit.xml');
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment