CS in HttpClient dir

Author: Matt Humphrey

lib/Gitlab/HttpClient/HttpClient.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace Gitlab\HttpClient;
+<?php namespace Gitlab\HttpClient;
 
 use Buzz\Client\ClientInterface;
 use Buzz\Listener\ListenerInterface;
@@ -15,6 +13,7 @@
  * Performs requests on Gitlab API. API documentation should be self-explanatory.
  *
  * @author Joseph Bielawski <stloyd@gmail.com>
+ * @author Matt Humphrey <matt@m4tt.co>
  */
 class HttpClient implements HttpClientInterface
 {
@@ -26,18 +25,28 @@ class HttpClient implements HttpClientInterface
         'timeout'     => 10,
     );
 
-    protected $base_url = null;
+    /**
+     * @var string
+     */
+    protected $baseUrl;
 
     /**
-     * @var array
+     * @var ListenerInterface[]
      */
     protected $listeners = array();
     /**
      * @var array
      */
     protected $headers = array();
 
+    /**
+     * @var Response
+     */
     private $lastResponse;
+
+    /**
+     * @var Request
+     */
     private $lastRequest;
 
     /**
@@ -46,9 +55,9 @@ class HttpClient implements HttpClientInterface
      */
     public function __construct($baseUrl, array $options, ClientInterface $client)
     {
-        $this->base_url = $baseUrl;
-        $this->options  = array_merge($this->options, $options);
-        $this->client   = $client;
+        $this->baseUrl = $baseUrl;
+        $this->options = array_merge($this->options, $options);
+        $this->client  = $client;
 
         $this->addListener(new ErrorListener($this->options));
 
@@ -136,7 +145,7 @@ public function put($path, array $parameters = array(), array $headers = array()
      */
     public function request($path, array $parameters = array(), $httpMethod = 'GET', array $headers = array())
     {
-        $path = trim($this->base_url.$path, '/');
+        $path = trim($this->baseUrl.$path, '/');
 
         $request = $this->createRequest($httpMethod, $path);
         $request->addHeaders($headers);
@@ -190,7 +199,6 @@ public function getLastResponse()
     /**
      * @param string $httpMethod
      * @param string $url
-     *
      * @return Request
      */
     private function createRequest($httpMethod, $url)

lib/Gitlab/HttpClient/HttpClientInterface.php

@@ -1,13 +1,12 @@
-<?php
-
-namespace Gitlab\HttpClient;
+<?php namespace Gitlab\HttpClient;
 
 use Gitlab\Exception\InvalidArgumentException;
 
 /**
  * Performs requests on Gitlab API. API documentation should be self-explanatory.
  *
  * @author Joseph Bielawski <stloyd@gmail.com>
+ * @author Matt Humphrey <matt@m4tt.co>
  */
 interface HttpClientInterface
 {

lib/Gitlab/HttpClient/Listener/AuthListener.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace Gitlab\HttpClient\Listener;
+<?php namespace Gitlab\HttpClient\Listener;
 
 use Gitlab\Client;
 use Gitlab\Exception\InvalidArgumentException;

lib/Gitlab/HttpClient/Listener/ErrorListener.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace Gitlab\HttpClient\Listener;
+<?php namespace Gitlab\HttpClient\Listener;
 
 use Buzz\Listener\ListenerInterface;
 use Buzz\Message\MessageInterface;

lib/Gitlab/HttpClient/Message/Request.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace Gitlab\HttpClient\Message;
+<?php namespace Gitlab\HttpClient\Message;
 
 use Buzz\Message\Request as BaseRequest;
 

lib/Gitlab/HttpClient/Message/Response.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace Gitlab\HttpClient\Message;
+<?php namespace Gitlab\HttpClient\Message;
 
 use Buzz\Message\Response as BaseResponse;
 
@@ -12,16 +10,17 @@ class Response extends BaseResponse
     public function getContent()
     {
         $response = parent::getContent();
-        if ($this->getHeader("Content-Type") === "application/json") {
+
+        if ($this->getHeader('Content-Type') === 'application/json') {
             $content  = json_decode($response, true);
 
             if (JSON_ERROR_NONE !== json_last_error()) {
                 return $response;
             }
 
             return $content;
-        } else {
-            return $response;
         }
+
+        return $response;
     }
 }