Fixed tests and docs

Author: Nyholm

doc/api_version.md

@@ -8,6 +8,6 @@ For example:
 $client = new Github\Client();
 echo $client->getApiVersion(); // prints "v3"
 
-$client = new Github\Client(new Github\HttpClient\Builder(), 'v2');
+$client = new Github\Client($httpClient, 'v2');
 echo $client->getApiVersion(); // prints "v2"
 ```

doc/customize.md

@@ -11,7 +11,7 @@ community provided clients is found here: https://packagist.org/providers/php-ht
 You can inject a HTTP client through the `Github\Client` constructor:
 
 ```php
-$client = new Github\Client(new \Github\HttpClient\Builder(new Http\Adapter\Guzzle6\Client()));
+$client = new Github\Client(new Http\Adapter\Guzzle6\Client());
 ```
 
 ### Configure the HTTP client
@@ -36,7 +36,10 @@ class CustomUserAgentPlugin implements Plugin
     }
 }
 
-$githubClient->addPlugin(new CustomUserAgentPlugin());
+$httpBuilder = new Github\HttpClient\Builder(new Http\Adapter\Guzzle6\Client());
+$httpBuilder->addPlugin(new CustomUserAgentPlugin());
+
+$client = new Github\Client(null, $httpBuilder);
 ```
 
 ### Run Test Suite

doc/security.md

@@ -54,7 +54,7 @@ The following sample code authenticates as an installation using [lcobucci/jwt](
 to generate a JSON Web Token (JWT).
 
 ```php
-$github = new Github\Client(new Github\HttpClient\Builder(), 'machine-man-preview');
+$github = new Github\Client(new GuzzleClient(), 'machine-man-preview');
 
 $jwt = (new Builder)
     ->setIssuer($integrationId)

lib/Github/Client.php

@@ -110,7 +110,7 @@ class Client
      * @param string|null     $apiVersion
      * @param string|null     $enterpriseUrl
      */
-    public function __construct(HttpClient $httpClient, Builder $httpClientBuilder = null, $apiVersion = null, $enterpriseUrl = null)
+    public function __construct(HttpClient $httpClient = null, Builder $httpClientBuilder = null, $apiVersion = null, $enterpriseUrl = null)
     {
         $this->responseHistory = new History();
         $this->httpClientBuilder = $builder = $httpClientBuilder ?: new Builder($httpClient);

test/Github/Tests/Api/TestCase.php

@@ -24,7 +24,7 @@ protected function getApiMock()
             ->expects($this->any())
             ->method('sendRequest');
 
-        $client = new \Github\Client(new Builder($httpClient));
+        $client = new \Github\Client($httpClient);
 
         return $this->getMockBuilder($this->getApiClass())
             ->setMethods(array('get', 'post', 'postRaw', 'patch', 'delete', 'put', 'head'))

test/Github/Tests/ClientTest.php

@@ -24,12 +24,12 @@ public function shouldNotHaveToPassHttpClientToConstructor()
     /**
      * @test
      */
-    public function shouldPassHttpClientBulderInterfaceToConstructor()
+    public function shouldPassHttpClientInterfaceToConstructor()
     {
         $httpClientMock = $this->getMockBuilder(\Http\Client\HttpClient::class)
             ->getMock();
 
-        $client = new Client(new Builder($httpClientMock));
+        $client = new Client($httpClientMock);
 
         $this->assertInstanceOf(\Http\Client\HttpClient::class, $client->getHttpClient());
     }

test/Github/Tests/ResultPagerTest.php

@@ -40,7 +40,7 @@ public function shouldGetAllResults()
             ->method('sendRequest')
             ->will($this->returnValue($response));
 
-        $client = new Client(new Builder($httpClientMock));
+        $client = new Client($httpClientMock);
 
         // memberApi Mock
         $memberApi = new Members($client);
@@ -87,7 +87,7 @@ public function shouldGetAllSearchResults()
             ->method('sendRequest')
             ->will($this->returnValue($response));
 
-        $client = new Client(new Builder($httpClientMock));
+        $client = new Client($httpClientMock);
 
         $searchApi = new Search($client);
         $method = 'users';