Refactor of Client's code:

Don't create default HttpClient instance till it's needed
Moved part of authentication code to HttpClient
DRYied AuthListener a bit

Author: stloyd

composer.json

@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-master": "1.2.x-dev"
         }
     }
 }

lib/Github/Client.php

@@ -9,7 +9,6 @@
 use Github\Exception\InvalidArgumentException;
 use Github\HttpClient\HttpClient;
 use Github\HttpClient\HttpClientInterface;
-use Github\HttpClient\Listener\AuthListener;
 
 /**
  * Simple yet very cool PHP GitHub client
@@ -73,7 +72,9 @@ class Client
      */
     public function __construct(HttpClientInterface $httpClient = null)
     {
-        $this->httpClient = $httpClient ?: new HttpClient($this->options);
+        if (null !== $httpClient) {
+            $this->httpClient = $httpClient;
+        }
     }
 
     /**
@@ -134,7 +135,7 @@ public function api($name)
                 break;
 
             default:
-                throw new InvalidArgumentException();
+                throw new InvalidArgumentException(sprintf('Undefined api instance called: "%s"', $name));
         }
 
         return $api;
@@ -160,22 +161,18 @@ public function authenticate($tokenOrLogin, $password = null, $authMethod = null
             $password   = null;
         }
 
-        $this->httpClient->addListener(
-            new AuthListener(
-                $authMethod,
-                array(
-                    'tokenOrLogin' => $tokenOrLogin,
-                    'password'     => $password
-                )
-            )
-        );
+        $this->httpClient->authenticate($tokenOrLogin, $password, $authMethod);
     }
 
     /**
      * @return HttpClient
      */
     public function getHttpClient()
     {
+        if (null === $this->httpClient) {
+            $this->httpClient = new HttpClient($this->options);
+        }
+
         return $this->httpClient;
     }
 
@@ -192,15 +189,15 @@ public function setHttpClient(HttpClientInterface $httpClient)
      */
     public function clearHeaders()
     {
-        $this->httpClient->clearHeaders();
+        $this->getHttpClient()->clearHeaders();
     }
 
     /**
      * @param array $headers
      */
     public function setHeaders(array $headers)
     {
-        $this->httpClient->setHeaders($headers);
+        $this->getHttpClient()->setHeaders($headers);
     }
 
     /**

lib/Github/HttpClient/HttpClient.php

@@ -9,6 +9,7 @@
 
 use Github\Exception\ErrorException;
 use Github\Exception\RuntimeException;
+use Github\HttpClient\Listener\AuthListener;
 use Github\HttpClient\Listener\ErrorListener;
 use Github\HttpClient\Message\Request;
 use Github\HttpClient\Message\Response;
@@ -65,6 +66,19 @@ public function __construct(array $options = array(), ClientInterface $client =
         $this->clearHeaders();
     }
 
+    public function authenticate($tokenOrLogin, $password, $authMethod)
+    {
+         $this->addListener(
+            new AuthListener(
+                $authMethod,
+                array(
+                     'tokenOrLogin' => $tokenOrLogin,
+                     'password'     => $password
+                )
+            )
+        );
+    }
+
     /**
      * {@inheritDoc}
      */

lib/Github/HttpClient/Listener/AuthListener.php

@@ -68,27 +68,26 @@ public function preSend(RequestInterface $request)
                     throw new InvalidArgumentException('You need to set client_id and client_secret!');
                 }
 
-                $url = $request->getUrl();
-
-                $parameters = array(
-                    'client_id'     => $this->options['tokenOrLogin'],
-                    'client_secret' => $this->options['password'],
+                $this->setRequestUrl(
+                    $request,
+                    array(
+                        'client_id'     => $this->options['tokenOrLogin'],
+                        'client_secret' => $this->options['password'],
+                    )
                 );
-
-                $url .= (false === strpos($url, '?') ? '?' : '&').utf8_encode(http_build_query($parameters, '', '&'));
-
-                $request->fromUrl(new Url($url));
                 break;
 
             case Client::AUTH_URL_TOKEN:
                 if (!isset($this->options['tokenOrLogin'])) {
                     throw new InvalidArgumentException('You need to set OAuth token!');
                 }
 
-                $url  = $request->getUrl();
-                $url .= (false === strpos($url, '?') ? '?' : '&').utf8_encode(http_build_query(array('access_token' => $this->options['tokenOrLogin']), '', '&'));
-
-                $request->fromUrl(new Url($url));
+                $this->setRequestUrl(
+                    $request,
+                    array(
+                        'access_token' => $this->options['tokenOrLogin'],
+                    )
+                );
                 break;
 
             default:
@@ -102,4 +101,18 @@ public function preSend(RequestInterface $request)
     public function postSend(RequestInterface $request, MessageInterface $response)
     {
     }
+
+    /**
+     * @param RequestInterface $request
+     * @param array            $parameters
+     *
+     * @return Url
+     */
+    private function setRequestUrl(RequestInterface $request, array $parameters = array())
+    {
+        $url  = $request->getUrl();
+        $url .= (false === strpos($url, '?') ? '?' : '&').utf8_encode(http_build_query($parameters, '', '&'));
+
+        $request->fromUrl(new Url($url));
+    }
 }