Fix psalm/phan's complaints about the DBAL config

dshoreman · Apr 20, 2021 · 9a7a208 · 9a7a208
1 parent cbd77e7
commit 9a7a208
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/app/Database.php b/app/Database.php
@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
+use Illuminate\Contracts\Config\Repository;
 
 class Database
 {
@@ -16,12 +17,16 @@ private function connection(): Connection
             return $this->connection;
         }
 
-        $this->connection = DriverManager::getConnection([
-            'user' => config('database.dbal.user'),
-            'password' => config('database.dbal.password'),
-            'unix_socket' => config('database.connections.mysql.unix_socket'),
-            'driver' => 'pdo_mysql',
-        ]);
+        $config = config();
+        assert($config instanceof Repository);
+        $socket = (string) $config->get('database.connections.mysql.unix_socket');
+
+        $this->connection = DriverManager::getConnection(
+            array_merge((array) config('database.dbal'), [
+                'driver' => 'pdo_mysql',
+                'unix_socket' => $socket,
+            ]),
+        );
 
         return $this->connection;
     }