Merge pull request #793 from yajra/fix-config

fix: config structure
yajra · Jun 29, 2023 · ee66376 · ee66376
2 parents c7cdc13 + f581a16
commit ee66376
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 27 deletions.
diff --git a/src/Oci8/Oci8Connection.php b/src/Oci8/Oci8Connection.php
@@ -4,7 +4,6 @@
 
 use Doctrine\DBAL\Driver\OCI8\Driver as DoctrineDriver;
 use Doctrine\DBAL\Version;
-use Exception;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Grammar;
 use Illuminate\Support\Str;

diff --git a/src/config/oracle.php b/src/config/oracle.php
@@ -2,28 +2,28 @@
 
 return [
     'oracle' => [
-        'driver'         => 'oracle',
-        'tns'            => env('DB_TNS', ''),
-        'host'           => env('DB_HOST', ''),
-        'port'           => env('DB_PORT', '1521'),
-        'database'       => env('DB_DATABASE', ''),
-        'service_name'   => env('DB_SERVICE_NAME', ''),
-        'username'       => env('DB_USERNAME', ''),
-        'password'       => env('DB_PASSWORD', ''),
-        'charset'        => env('DB_CHARSET', 'AL32UTF8'),
-        'prefix'         => env('DB_PREFIX', ''),
-        'prefix_schema'  => env('DB_SCHEMA_PREFIX', ''),
-        'edition'        => env('DB_EDITION', 'ora$base'),
+        'driver' => 'oracle',
+        'tns' => env('DB_TNS', ''),
+        'host' => env('DB_HOST', ''),
+        'port' => env('DB_PORT', '1521'),
+        'database' => env('DB_DATABASE', ''),
+        'service_name' => env('DB_SERVICE_NAME', ''),
+        'username' => env('DB_USERNAME', ''),
+        'password' => env('DB_PASSWORD', ''),
+        'charset' => env('DB_CHARSET', 'AL32UTF8'),
+        'prefix' => env('DB_PREFIX', ''),
+        'prefix_schema' => env('DB_SCHEMA_PREFIX', ''),
+        'edition' => env('DB_EDITION', 'ora$base'),
         'server_version' => env('DB_SERVER_VERSION', '11g'),
-        'load_balance'   => env('DB_LOAD_BALANCE', 'yes'),
-        'max_name_len'   => env('ORA_MAX_NAME_LEN', 30),
-        'dynamic'        => [],
-    ],
-    'sessionVars' => [
-        'NLS_TIME_FORMAT'         => 'HH24:MI:SS',
-        'NLS_DATE_FORMAT'         => 'YYYY-MM-DD HH24:MI:SS',
-        'NLS_TIMESTAMP_FORMAT'    => 'YYYY-MM-DD HH24:MI:SS',
-        'NLS_TIMESTAMP_TZ_FORMAT' => 'YYYY-MM-DD HH24:MI:SS TZH:TZM',
-        'NLS_NUMERIC_CHARACTERS'  => '.,',
+        'load_balance' => env('DB_LOAD_BALANCE', 'yes'),
+        'max_name_len' => env('ORA_MAX_NAME_LEN', 30),
+        'dynamic' => [],
+        'sessionVars' => [
+            'NLS_TIME_FORMAT' => 'HH24:MI:SS',
+            'NLS_DATE_FORMAT' => 'YYYY-MM-DD HH24:MI:SS',
+            'NLS_TIMESTAMP_FORMAT' => 'YYYY-MM-DD HH24:MI:SS',
+            'NLS_TIMESTAMP_TZ_FORMAT' => 'YYYY-MM-DD HH24:MI:SS TZH:TZM',
+            'NLS_NUMERIC_CHARACTERS' => '.,',
+        ],
     ],
 ];
diff --git a/tests/Database/Oci8ConnectorTest.php b/tests/Database/Oci8ConnectorTest.php
@@ -44,8 +44,8 @@ public function testOptionResolution()
     /**
      * @dataProvider tnsDataProvider
      *
-     * @param $dsn
-     * @param $config
+     * @param  $dsn
+     * @param  $config
      */
     public function testOracleConnectCallsCreateConnectionWithProperArguments($dsn, $config)
     {

diff --git a/tests/Database/OracleEloquentTest.php b/tests/Database/OracleEloquentTest.php
@@ -48,8 +48,8 @@ public function testNewBaseQueryBuilderReturnsOracleBuilderForOracleGrammar()
     }
 
     /**
-     * @param $model
-     * @param $database
+     * @param  $model
+     * @param  $database
      */
     protected function mockConnectionForModel($model, $database)
     {