Move base URI from Client to Factory

Author: clue

src/Client.php

@@ -29,11 +29,10 @@ class Client
      * SHOULD NOT be called manually, see Factory::createClient() instead
      *
      * @param Browser             $browser
-     * @param string              $url
      * @param ResponseParser|null $parser
      * @see Factory::createClient()
      */
-    public function __construct(Browser $browser, $url, ResponseParser $parser = null, StreamingParser $streamingParser = null)
+    public function __construct(Browser $browser, ResponseParser $parser = null, StreamingParser $streamingParser = null)
     {
         if ($parser === null) {
             $parser = new ResponseParser();
@@ -43,7 +42,7 @@ public function __construct(Browser $browser, $url, ResponseParser $parser = nul
             $streamingParser = new StreamingParser();
         }
 
-        $this->browser = $browser->withBase($url);
+        $this->browser = $browser;
         $this->parser = $parser;
         $this->streamingParser = $streamingParser;
     }

src/Factory.php

@@ -40,6 +40,6 @@ public function createClient($url = null)
             $url = 'http://localhost/';
         }
 
-        return new Client($browser, $url);
+        return new Client($browser->withBase($url));
     }
 }

tests/ClientTest.php

@@ -21,10 +21,11 @@ public function setUp()
         $this->loop = $this->getMock('React\EventLoop\LoopInterface');
         $this->sender = $this->getMockBuilder('Clue\React\Buzz\Io\Sender')->disableOriginalConstructor()->getMock();
         $this->browser = new Browser($this->loop, $this->sender);
+        $this->browser = $this->browser->withBase('http://x/');
 
         $this->parser = $this->getMock('Clue\React\Docker\Io\ResponseParser');
         $this->streamingParser = $this->getMock('Clue\React\Docker\Io\StreamingParser');
-        $this->client = new Client($this->browser, 'http://x/', $this->parser, $this->streamingParser);
+        $this->client = new Client($this->browser, $this->parser, $this->streamingParser);
     }
 
     public function testPing()

tests/FactoryTest.php

@@ -24,6 +24,7 @@ public function testCtorDefaultBrowser()
     public function testCreateClientUsesCustomUnixSender()
     {
         $this->browser->expects($this->once())->method('withSender')->will($this->returnValue($this->browser));
+        $this->browser->expects($this->once())->method('withBase')->will($this->returnValue($this->browser));
 
         $client = $this->factory->createClient();
 
@@ -33,6 +34,7 @@ public function testCreateClientUsesCustomUnixSender()
     public function testCreateClientWithHttp()
     {
         $this->browser->expects($this->never())->method('withSender');
+        $this->browser->expects($this->once())->method('withBase')->with($this->equalTo('http://localhost:1234/'))->will($this->returnValue($this->browser));
 
         $this->factory->createClient('http://localhost:1234/');
     }