Merge pull request #152 from fbourigault/fix-profile-client-factory

Fix ProfileClient creation with callable factory

Author: fbourigault

Collector/ProfileClientFactory.php

@@ -51,7 +51,7 @@ public function __construct($factory, Collector $collector, Formatter $formatter
      */
     public function createClient(array $config = [])
     {
-        $client = is_callable($this->factory) ? $this->factory($config) : $this->factory->createClient($config);
+        $client = is_callable($this->factory) ? call_user_func($this->factory, $config) : $this->factory->createClient($config);
 
         if (!($client instanceof HttpClient && $client instanceof HttpAsyncClient)) {
             $client = new FlexibleHttpClient($client);

Tests/Unit/Collector/ProfileClientFactoryTest.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Http\HttplugBundle\Tests\Unit\Collector;
+
+use Http\Client\HttpClient;
+use Http\HttplugBundle\ClientFactory\ClientFactory;
+use Http\HttplugBundle\Collector\Collector;
+use Http\HttplugBundle\Collector\Formatter;
+use Http\HttplugBundle\Collector\ProfileClient;
+use Http\HttplugBundle\Collector\ProfileClientFactory;
+
+class ProfileClientFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Collector
+     */
+    private $collector;
+
+    /**
+     * @var Formatter
+     */
+    private $formatter;
+
+    /**
+     * @var HttpClient
+     */
+    private $client;
+
+    public function setUp()
+    {
+        $this->collector = $this->getMockBuilder(Collector::class)->disableOriginalConstructor()->getMock();
+        $this->formatter = $this->getMockBuilder(Formatter::class)->disableOriginalConstructor()->getMock();
+        $this->client = $this->getMockBuilder(HttpClient::class)->getMock();
+    }
+
+    public function testCreateClientFromClientFactory()
+    {
+        $factory = $this->getMockBuilder(ClientFactory::class)->getMock();
+        $factory->method('createClient')->willReturn($this->client);
+
+        $subject = new ProfileClientFactory($factory, $this->collector, $this->formatter);
+
+        $this->assertInstanceOf(ProfileClient::class, $subject->createClient());
+    }
+
+    public function testCreateClientFromCallable()
+    {
+        $factory = function ($config) {
+            return $this->client;
+        };
+
+        $subject = new ProfileClientFactory($factory, $this->collector, $this->formatter);
+
+        $this->assertInstanceOf(ProfileClient::class, $subject->createClient());
+    }
+}