Refactored building statsd options building

Author: vgarvardt

src/Client/StatsD.php

@@ -32,27 +32,27 @@ class StatsD extends AbstractClient implements Client
     public function __construct($dsn)
     {
         $this->client = new StatsDClient();
-        $this->configure($dsn);
+        $this->client->configure($this->buildOptions($dsn));
         $this->resetHTTPRequestSection();
     }
 
     /**
      * @param string $dsn
+     *
+     * @return array
      */
-    protected function configure($dsn)
+    protected function buildOptions($dsn)
     {
         $url = (array)parse_url($dsn);
 
         parse_str(empty($url['query']) ? '' : $url['query'], $params);
-        $options = [
+        return [
             'host' => empty($url['host']) ? 'localhost' : $url['host'],
             'port' => empty($url['port']) ? 8125 : $url['port'],
             'namespace' => empty($url['path']) ? '' : trim($url['path'], '/'),
             'timeout' => empty($params['timeout']) ? null : (float)$params['timeout'],
             'throwConnectionExceptions' => isset($params['error']) ? (bool)$params['error'] : true,
         ];
-
-        $this->client->configure($options);
     }
 
     /**

tests/Client/StatsDTest.php

@@ -11,7 +11,7 @@
 
 class StatsDTest extends TestCase
 {
-    public function testConfigure()
+    public function testBuildOptions()
     {
         if (!class_exists('\League\StatsD\Client')) {
             $this->markTestSkipped('Missing league/statsd package');
@@ -21,25 +21,19 @@ public function testConfigure()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $statsdClient = $this->getMockBuilder('\League\StatsD\Client')->getMock();
-        $statsdClient->expects($this->once())
-            ->method('configure')
-            ->with([
+        $reflection = new \ReflectionClass($statsClient);
+        $methodBuildOptions = $reflection->getMethod('buildOptions');
+        $methodBuildOptions->setAccessible(true);
+        $this->assertEquals(
+            [
                 'host' => 'stats.local',
                 'port' => 1234,
                 'namespace' => 'prefix.ns',
                 'timeout' => 2.5,
                 'throwConnectionExceptions' => false,
-            ]);
-
-        $reflection = new \ReflectionClass($statsClient);
-        $propertyClient = $reflection->getProperty('client');
-        $propertyClient->setAccessible(true);
-        $propertyClient->setValue($statsClient, $statsdClient);
-
-        $methodConfigure = $reflection->getMethod('configure');
-        $methodConfigure->setAccessible(true);
-        $methodConfigure->invoke($statsClient, 'statsd://stats.local:1234/prefix.ns?timeout=2.5&error=0');
+            ],
+            $methodBuildOptions->invoke($statsClient, 'statsd://stats.local:1234/prefix.ns?timeout=2.5&error=0')
+        );
     }
 
     public function testInstances()