DI for Browser and only exchange its Sender instance

Author: clue

src/Factory.php

@@ -11,10 +11,16 @@
 class Factory
 {
     private $loop;
+    private $browser;
 
-    public function __construct(LoopInterface $loop)
+    public function __construct(LoopInterface $loop, Browser $browser = null)
     {
+        if ($browser === null) {
+            $browser = new Browser($loop);
+        }
+
         $this->loop = $loop;
+        $this->browser = $browser;
     }
 
     public function createClient($url = null)
@@ -23,18 +29,17 @@ public function createClient($url = null)
             $url = 'unix:///var/run/docker.sock';
         }
 
-        $sender = null;
+        $browser = $this->browser;
 
         if (substr($url, 0, 7) === 'unix://') {
             // send everything through a local unix domain socket
             $sender = Sender::createFromLoopUnix($this->loop, $url);
+            $browser = $browser->withSender($sender);
 
             // pretend all HTTP URLs to be on localhost
             $url = 'http://localhost';
         }
 
-        $browser = new Browser($this->loop, $sender);
-
         return new Client($browser, $url);
     }
 }

tests/FactoryTest.php

@@ -6,18 +6,34 @@
 class FactoryTest extends TestCase
 {
     private $loop;
+    private $browser;
     private $factory;
 
     public function setUp()
     {
         $this->loop = LoopFactory::create();
-        $this->factory = new Factory($this->loop);
+        $this->browser = $this->getMockBuilder('Clue\React\Buzz\Browser')->disableOriginalConstructor()->getMock();
+        $this->factory = new Factory($this->loop, $this->browser);
     }
 
-    public function testCreateClientDefault()
+    public function testCtorDefaultBrowser()
     {
+        $factory = new Factory($this->loop);
+    }
+
+    public function testCreateClientUsesCustomUnixSender()
+    {
+        $this->browser->expects($this->once())->method('withSender')->will($this->returnValue($this->browser));
+
         $client = $this->factory->createClient();
 
         $this->assertInstanceOf('Clue\React\Docker\Client', $client);
     }
+
+    public function testCreateClientWithHttp()
+    {
+        $this->browser->expects($this->never())->method('withSender');
+
+        $this->factory->createClient('http://localhost:1234/');
+    }
 }