Revert the accidental rename of `driverOptions` to `driver_options`

parent 0112caa8
...@@ -16,7 +16,7 @@ final class Driver extends AbstractDB2Driver ...@@ -16,7 +16,7 @@ final class Driver extends AbstractDB2Driver
isset($params['persistent']) && $params['persistent'] === true, isset($params['persistent']) && $params['persistent'] === true,
$params['user'] ?? '', $params['user'] ?? '',
$params['password'] ?? '', $params['password'] ?? '',
$params['driver_options'] ?? [] $params['driverOptions'] ?? []
); );
} }
} }
...@@ -31,8 +31,8 @@ final class Driver extends AbstractMySQLDriver ...@@ -31,8 +31,8 @@ final class Driver extends AbstractMySQLDriver
$preInitializers = $postInitializers = []; $preInitializers = $postInitializers = [];
if (isset($params['driver_options'])) { if (isset($params['driverOptions'])) {
$driverOptions = $params['driver_options']; $driverOptions = $params['driverOptions'];
if (isset($driverOptions[Connection::OPTION_FLAGS])) { if (isset($driverOptions[Connection::OPTION_FLAGS])) {
$flags = $driverOptions[Connection::OPTION_FLAGS]; $flags = $driverOptions[Connection::OPTION_FLAGS];
......
...@@ -13,7 +13,7 @@ final class Driver extends AbstractMySQLDriver ...@@ -13,7 +13,7 @@ final class Driver extends AbstractMySQLDriver
*/ */
public function connect(array $params) public function connect(array $params)
{ {
$driverOptions = $params['driver_options'] ?? []; $driverOptions = $params['driverOptions'] ?? [];
if (! empty($params['persistent'])) { if (! empty($params['persistent'])) {
$driverOptions[PDO::ATTR_PERSISTENT] = true; $driverOptions[PDO::ATTR_PERSISTENT] = true;
......
...@@ -13,7 +13,7 @@ final class Driver extends AbstractOracleDriver ...@@ -13,7 +13,7 @@ final class Driver extends AbstractOracleDriver
*/ */
public function connect(array $params) public function connect(array $params)
{ {
$driverOptions = $params['driver_options'] ?? []; $driverOptions = $params['driverOptions'] ?? [];
if (! empty($params['persistent'])) { if (! empty($params['persistent'])) {
$driverOptions[PDO::ATTR_PERSISTENT] = true; $driverOptions[PDO::ATTR_PERSISTENT] = true;
......
...@@ -15,7 +15,7 @@ final class Driver extends AbstractPostgreSQLDriver ...@@ -15,7 +15,7 @@ final class Driver extends AbstractPostgreSQLDriver
*/ */
public function connect(array $params) public function connect(array $params)
{ {
$driverOptions = $params['driver_options'] ?? []; $driverOptions = $params['driverOptions'] ?? [];
if (! empty($params['persistent'])) { if (! empty($params['persistent'])) {
$driverOptions[PDO::ATTR_PERSISTENT] = true; $driverOptions[PDO::ATTR_PERSISTENT] = true;
......
...@@ -20,8 +20,8 @@ final class Driver extends AbstractSQLServerDriver ...@@ -20,8 +20,8 @@ final class Driver extends AbstractSQLServerDriver
{ {
$pdoOptions = $dsnOptions = []; $pdoOptions = $dsnOptions = [];
if (isset($params['driver_options'])) { if (isset($params['driverOptions'])) {
foreach ($params['driver_options'] as $option => $value) { foreach ($params['driverOptions'] as $option => $value) {
if (is_int($option)) { if (is_int($option)) {
$pdoOptions[$option] = $value; $pdoOptions[$option] = $value;
} else { } else {
......
...@@ -22,7 +22,7 @@ final class Driver extends AbstractSQLiteDriver ...@@ -22,7 +22,7 @@ final class Driver extends AbstractSQLiteDriver
*/ */
public function connect(array $params) public function connect(array $params)
{ {
$driverOptions = $params['driver_options'] ?? []; $driverOptions = $params['driverOptions'] ?? [];
if (isset($driverOptions['userDefinedFunctions'])) { if (isset($driverOptions['userDefinedFunctions'])) {
$this->_userDefinedFunctions = array_merge( $this->_userDefinedFunctions = array_merge(
......
...@@ -27,7 +27,7 @@ final class Driver extends AbstractSQLServerDriver ...@@ -27,7 +27,7 @@ final class Driver extends AbstractSQLServerDriver
throw PortWithoutHost::new(); throw PortWithoutHost::new();
} }
$driverOptions = $params['driver_options'] ?? []; $driverOptions = $params['driverOptions'] ?? [];
if (isset($params['dbname'])) { if (isset($params['dbname'])) {
$driverOptions['Database'] = $params['dbname']; $driverOptions['Database'] = $params['dbname'];
......
...@@ -71,7 +71,7 @@ class DriverTest extends AbstractPostgreSQLDriverTest ...@@ -71,7 +71,7 @@ class DriverTest extends AbstractPostgreSQLDriverTest
return $this->createDriver()->connect( return $this->createDriver()->connect(
array_merge( array_merge(
TestUtil::getConnectionParams(), TestUtil::getConnectionParams(),
['driver_options' => $driverOptions] ['driverOptions' => $driverOptions]
) )
); );
} }
......
...@@ -64,7 +64,7 @@ class ConnectionTest extends FunctionalTestCase ...@@ -64,7 +64,7 @@ class ConnectionTest extends FunctionalTestCase
return (new Driver())->connect( return (new Driver())->connect(
array_merge( array_merge(
$params, $params,
['driver_options' => $driverOptions] ['driverOptions' => $driverOptions]
) )
); );
} }
......
...@@ -45,7 +45,7 @@ class DriverTest extends AbstractDriverTest ...@@ -45,7 +45,7 @@ class DriverTest extends AbstractDriverTest
return $this->connection->getDriver()->connect( return $this->connection->getDriver()->connect(
array_merge( array_merge(
TestUtil::getConnectionParams(), TestUtil::getConnectionParams(),
['driver_options' => $driverOptions] ['driverOptions' => $driverOptions]
) )
); );
} }
......
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