Fixed handling of password var.

denpamusic · Sep 8, 2018 · 16e29bb · 16e29bb
1 parent c384647
commit 16e29bb
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -222,9 +222,6 @@ public function __call($method, array $params = [])
      */
     protected function defaultConfig(array $config = [])
     {
-        // use same var name as laravel-bitcoinrpc
-        $config['password'] = isset($config['pass']) ? $config['pass'] : '';
-
         $defaults = [
             'scheme'     => 'http',
             'host'       => '127.0.0.1',
@@ -233,6 +230,15 @@ protected function defaultConfig(array $config = [])
             'password'   => '',
         ];
 
+        // use same var name as laravel-bitcoinrpc
+        if (
+            ! array_key_exists('password', $config) &&
+              array_key_exists('pass', $config)
+        ) {
+            $config['password'] = $config['pass'];
+            unset($config['pass']);
+        }
+
         return array_merge($defaults, $config);
     }