Revert the accidental rename of driverOptions to driver_options

doctrine · Aug 20, 2020 · f970697 · f970697
1 parent 0112caa
commit f970697
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/src/Driver/IBMDB2/Driver.php b/src/Driver/IBMDB2/Driver.php
@@ -16,7 +16,7 @@ public function connect(array $params)
             isset($params['persistent']) && $params['persistent'] === true,
             $params['user'] ?? '',
             $params['password'] ?? '',
-            $params['driver_options'] ?? []
+            $params['driverOptions'] ?? []
         );
     }
 }
diff --git a/src/Driver/Mysqli/Driver.php b/src/Driver/Mysqli/Driver.php
@@ -31,8 +31,8 @@ public function connect(array $params)
 
         $preInitializers = $postInitializers = [];
 
-        if (isset($params['driver_options'])) {
-            $driverOptions = $params['driver_options'];
+        if (isset($params['driverOptions'])) {
+            $driverOptions = $params['driverOptions'];
 
             if (isset($driverOptions[Connection::OPTION_FLAGS])) {
                 $flags = $driverOptions[Connection::OPTION_FLAGS];

diff --git a/src/Driver/PDO/MySQL/Driver.php b/src/Driver/PDO/MySQL/Driver.php
@@ -13,7 +13,7 @@ final class Driver extends AbstractMySQLDriver
      */
     public function connect(array $params)
     {
-        $driverOptions = $params['driver_options'] ?? [];
+        $driverOptions = $params['driverOptions'] ?? [];
 
         if (! empty($params['persistent'])) {
             $driverOptions[PDO::ATTR_PERSISTENT] = true;

diff --git a/src/Driver/PDO/OCI/Driver.php b/src/Driver/PDO/OCI/Driver.php
@@ -13,7 +13,7 @@ final class Driver extends AbstractOracleDriver
      */
     public function connect(array $params)
     {
-        $driverOptions = $params['driver_options'] ?? [];
+        $driverOptions = $params['driverOptions'] ?? [];
 
         if (! empty($params['persistent'])) {
             $driverOptions[PDO::ATTR_PERSISTENT] = true;

diff --git a/src/Driver/PDO/PgSQL/Driver.php b/src/Driver/PDO/PgSQL/Driver.php
@@ -15,7 +15,7 @@ final class Driver extends AbstractPostgreSQLDriver
      */
     public function connect(array $params)
     {
-        $driverOptions = $params['driver_options'] ?? [];
+        $driverOptions = $params['driverOptions'] ?? [];
 
         if (! empty($params['persistent'])) {
             $driverOptions[PDO::ATTR_PERSISTENT] = true;

diff --git a/src/Driver/PDO/SQLSrv/Driver.php b/src/Driver/PDO/SQLSrv/Driver.php
@@ -20,8 +20,8 @@ public function connect(array $params)
     {
         $pdoOptions = $dsnOptions = [];
 
-        if (isset($params['driver_options'])) {
-            foreach ($params['driver_options'] as $option => $value) {
+        if (isset($params['driverOptions'])) {
+            foreach ($params['driverOptions'] as $option => $value) {
                 if (is_int($option)) {
                     $pdoOptions[$option] = $value;
                 } else {

diff --git a/src/Driver/PDO/SQLite/Driver.php b/src/Driver/PDO/SQLite/Driver.php
@@ -22,7 +22,7 @@ final class Driver extends AbstractSQLiteDriver
      */
     public function connect(array $params)
     {
-        $driverOptions = $params['driver_options'] ?? [];
+        $driverOptions = $params['driverOptions'] ?? [];
 
         if (isset($driverOptions['userDefinedFunctions'])) {
             $this->_userDefinedFunctions = array_merge(

diff --git a/src/Driver/SQLSrv/Driver.php b/src/Driver/SQLSrv/Driver.php
@@ -27,7 +27,7 @@ public function connect(array $params)
             throw PortWithoutHost::new();
         }
 
-        $driverOptions = $params['driver_options'] ?? [];
+        $driverOptions = $params['driverOptions'] ?? [];
 
         if (isset($params['dbname'])) {
             $driverOptions['Database'] = $params['dbname'];

diff --git a/tests/Driver/PDO/PgSQL/DriverTest.php b/tests/Driver/PDO/PgSQL/DriverTest.php
@@ -71,7 +71,7 @@ private function connect(array $driverOptions): Connection
         return $this->createDriver()->connect(
             array_merge(
                 TestUtil::getConnectionParams(),
-                ['driver_options' => $driverOptions]
+                ['driverOptions' => $driverOptions]
             )
         );
     }

diff --git a/tests/Functional/Driver/Mysqli/ConnectionTest.php b/tests/Functional/Driver/Mysqli/ConnectionTest.php
@@ -64,7 +64,7 @@ private function getConnection(array $driverOptions): Connection
         return (new Driver())->connect(
             array_merge(
                 $params,
-                ['driver_options' => $driverOptions]
+                ['driverOptions' => $driverOptions]
             )
         );
     }

diff --git a/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php b/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php
@@ -45,7 +45,7 @@ private function getConnection(array $driverOptions): Connection
         return $this->connection->getDriver()->connect(
             array_merge(
                 TestUtil::getConnectionParams(),
-                ['driver_options' => $driverOptions]
+                ['driverOptions' => $driverOptions]
             )
         );
     }