Allow instantiation with url string.

Author: denpamusic

src/Denpa/Bitcoin/Client.php

@@ -27,14 +27,14 @@ class Client
     /**
      * Class constructor.
      *
-     * @param array $config
+     * @param mixed $config
      *
      * @return void
      */
-    public function __construct(array $config = [])
+    public function __construct($config = [])
     {
         // init defaults
-        $config = $this->defaultConfig($this->expandUrl($config));
+        $config = $this->defaultConfig($this->parseUrl($config));
 
         // construct client
         $this->client = new GuzzleHttp([
@@ -249,20 +249,19 @@ protected function defaultConfig(array $config = [])
     /**
      * Expand URL config into components.
      *
-     * @param array $param
+     * @param mixed $config
      *
      * @return array
      */
-    protected function expandUrl(array $config)
+    protected function parseUrl($config)
     {
-        if (isset($config['url'])) {
-            $parts = parse_url($config['url']);
-
-            foreach (['scheme', 'host', 'port', 'user', 'pass'] as $setting) {
-                if (isset($parts[$setting])) {
-                    $config[$setting] = $parts[$setting];
-                }
+        if (is_string($config)) {
+            $parts = parse_url($config);
+            if (!$parts) {
+                throw new ClientException('Invalid url');
             }
+
+            return $parts;
         }
 
         return $config;

tests/Denpa/Bitcoin/ClientTest.php

@@ -69,7 +69,7 @@ public function setUp()
      */
     public function testUrlExpander($url, $scheme, $host, $port, $user, $pass)
     {
-        $bitcoind = new Client(['url' => $url]);
+        $bitcoind = new Client($url);
 
         $this->assertInstanceOf(Client::class, $bitcoind);
 
@@ -108,7 +108,7 @@ public function urlProvider()
      */
     public function testClientSetterGetter()
     {
-        $bitcoind = new Client(['url' => 'http://old_client.org']);
+        $bitcoind = new Client('http://old_client.org');
         $this->assertInstanceOf(Client::class, $bitcoind);
 
         $base_uri = $bitcoind->getConfig('base_uri');