Removed support for default headers in the builder

Author: Nyholm

lib/Github/Client.php

@@ -111,17 +111,15 @@ class Client
     public function __construct(Builder $httpClientBuilder = null, $apiVersion = null, $enterpriseUrl = null)
     {
         $this->responseHistory = new History();
-        $this->httpClientBuilder = $httpClientBuilder ?: new Builder();
-        $this->getHttpClientBuilder()->addDefaultHeaders([
-            'Accept' => sprintf('application/vnd.github.%s+json', $this->getApiVersion()),
-        ]);
+        $this->httpClientBuilder = $builder = $httpClientBuilder ?: new Builder();
 
-        $this->getHttpClientBuilder()->addPlugin(new GithubExceptionThrower());
-        $this->getHttpClientBuilder()->addPlugin(new Plugin\HistoryPlugin($this->responseHistory));
-        $this->getHttpClientBuilder()->addPlugin(new Plugin\RedirectPlugin());
-        $this->getHttpClientBuilder()->addPlugin(new Plugin\AddHostPlugin(UriFactoryDiscovery::find()->createUri('https://api.github.com')));
-        $this->getHttpClientBuilder()->addPlugin(new Plugin\HeaderDefaultsPlugin(array(
+        $builder->addPlugin(new GithubExceptionThrower());
+        $builder->addPlugin(new Plugin\HistoryPlugin($this->responseHistory));
+        $builder->addPlugin(new Plugin\RedirectPlugin());
+        $builder->addPlugin(new Plugin\AddHostPlugin(UriFactoryDiscovery::find()->createUri('https://api.github.com')));
+        $builder->addPlugin(new Plugin\HeaderDefaultsPlugin(array(
             'User-Agent' => 'php-github-api (http://github.com/KnpLabs/php-github-api)',
+            'Accept' => sprintf('application/vnd.github.%s+json', $this->getApiVersion()),
         )));
 
         $this->apiVersion = $apiVersion ?: 'v3';
@@ -290,11 +288,12 @@ public function authenticate($tokenOrLogin, $password = null, $authMethod = null
      */
     private function setEnterpriseUrl($enterpriseUrl)
     {
-        $this->getHttpClientBuilder()->removePlugin(Plugin\AddHostPlugin::class);
-        $this->getHttpClientBuilder()->removePlugin(PathPrepend::class);
+        $builder = $this->getHttpClientBuilder();
+        $builder->removePlugin(Plugin\AddHostPlugin::class);
+        $builder->removePlugin(PathPrepend::class);
 
-        $this->getHttpClientBuilder()->addPlugin(new Plugin\AddHostPlugin(UriFactoryDiscovery::find()->createUri($enterpriseUrl)));
-        $this->getHttpClientBuilder()->addPlugin(new PathPrepend(sprintf('/api/%s/', $this->getApiVersion())));
+        $builder->addPlugin(new Plugin\AddHostPlugin(UriFactoryDiscovery::find()->createUri($enterpriseUrl)));
+        $builder->addPlugin(new PathPrepend(sprintf('/api/%s/', $this->getApiVersion())));
     }
 
     /**

lib/Github/HttpClient/Builder.php

@@ -72,13 +72,6 @@ class Builder
      */
     private $headers = [];
 
-    /**
-     * Headers that will always be in the client.
-     *
-     * @var array
-     */
-    private $defaultHeaders = [];
-
     /**
      * @param HttpClient     $httpClient
      * @param RequestFactory $requestFactory
@@ -147,7 +140,7 @@ public function removePlugin($fqcn)
      */
     public function clearHeaders()
     {
-        $this->headers = $this->defaultHeaders;
+        $this->headers = [];
 
         $this->removePlugin(Plugin\HeaderAppendPlugin::class);
         $this->addPlugin(new Plugin\HeaderAppendPlugin($this->headers));
@@ -164,19 +157,6 @@ public function addHeaders(array $headers)
         $this->addPlugin(new Plugin\HeaderAppendPlugin($this->headers));
     }
 
-    /**
-     * Add default headers. Default headers will not be cleared when calling clearHeaders.
-     *
-     * @param array $headers
-     */
-    public function addDefaultHeaders(array $headers)
-    {
-        $this->defaultHeaders = array_merge($this->defaultHeaders, $headers);
-
-        $this->removePlugin(Plugin\HeaderAppendPlugin::class);
-        $this->addPlugin(new Plugin\HeaderAppendPlugin(array_merge($this->defaultHeaders, $this->headers)));
-    }
-
     /**
      * Add a cache plugin to cache responses locally.
      *