Happyr / php-api-client

src/Happyr/ApiClient/Http/Client.php

Doc Comments +1 added lines, -5 removed lines

@@ -46,10 +46,8 @@ 
      * be the post variables
      * @param string $httpVerb (optional) either GET or POST.
      * will contain the http response code
-     * @param boolean $suppressExceptions, (optional) if true, we will catch all HttpExceptions that might be thrown by
-     * the Connection class
      *
-     * @return \Happyr\ApiClient\Http\Response
+     * @return Response
      * @throws HttpException
      */
     public function sendRequest($uri, array $data=array(), $httpVerb='GET')
@@ -72,8 +70,6 @@ 
     /**
      * Handle stuff when an error occur
      *
-     * @param string $body
-     * @param int $httpStatus
      *
      * @return Response
      * @throws \Happyr\ApiClient\Exceptions\HttpException

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
     public function __construct(Configuration $configuration)
     {
         $this->configuration = $configuration;
-        $class=$configuration->httpRequestClass;
+        $class = $configuration->httpRequestClass;
         $this->request = new $class();
     }
 
@@ -52,13 +52,13 @@ 
      * @return \Happyr\ApiClient\Http\Response
      * @throws HttpException
      */
-    public function sendRequest($uri, array $data=array(), $httpVerb='GET')
+    public function sendRequest($uri, array $data = array(), $httpVerb = 'GET')
     {
         //get headers
         $headers = array_merge($this->getAcceptHeader(), $this->getAuthenticationHeader());
         $headers['User-Agent'] = 'HappyrApiClient/'.$this->configuration->clientVersion;
 
-        $response=$this->request->send($this->configuration->baseUrl.'/api/'.$uri, $data, $httpVerb, $headers);
+        $response = $this->request->send($this->configuration->baseUrl.'/api/'.$uri, $data, $httpVerb, $headers);
         $response->setFormat($this->configuration->format);
 
         //if we got some non good http response code
@@ -84,7 +84,7 @@ 
             echo ('Exception: '.$response->getBody()."\n");
         }
 
-        $exception=new HttpException($response);
+        $exception = new HttpException($response);
 
         if ($this->configuration->enableExceptions) {
             //throw exceptions

src/Happyr/ApiClient/Http/Request/CurlRequest.php

Doc Comments +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
      * @param string $httpVerb
      * @param array $headers
      *
-     * @return mixed
+     * @return Response
      */
     public function send($uri, array $data = array(), $httpVerb = 'GET', array $headers = array())
     {
@@ -102,7 +102,7 @@ 
      * Load the curl object with the post data
      *
      *
-     * @param $ch
+     * @param resource $ch
      * @param array $data
      *
      */

Spacing +6 added lines, -6 removed lines

@@ -24,9 +24,9 @@ 
      */
     public function send($uri, array $data = array(), $httpVerb = 'GET', array $headers = array())
     {
-        $ch=curl_init();
+        $ch = curl_init();
 
-        $headers=$this->rewriteHeaders($headers);
+        $headers = $this->rewriteHeaders($headers);
 
         // Set a referrer and user agent
         if (isset($_SERVER['HTTP_HOST'])) {
@@ -91,10 +91,10 @@ 
 
         //add the filter on the filter string
         if (count($filters) > 0) {
-            $filterString='?'.http_build_query($filters);
+            $filterString = '?'.http_build_query($filters);
         }
 
-        return $uri . $filterString;
+        return $uri.$filterString;
     }
 
 
@@ -109,7 +109,7 @@ 
     protected function preparePostData($ch, array $data = array())
     {
         //urlify the data for the POST
-        $dataString=http_build_query($data);
+        $dataString = http_build_query($data);
 
         curl_setopt($ch, CURLOPT_POST, count($data));
         curl_setopt($ch, CURLOPT_POSTFIELDS, $dataString);
@@ -126,7 +126,7 @@ 
     {
         $betterHeaders = array();
         foreach ($headers as $key =>$value) {
-            $betterHeaders[]=sprintf('%s: %s', $key, $value);
+            $betterHeaders[] = sprintf('%s: %s', $key, $value);
         }
 
         return $betterHeaders;

src/Happyr/ApiClient/Http/Request/Guzzle.php

Spacing +8 added lines, -8 removed lines

@@ -25,26 +25,26 @@
      */
     public function send($url, array $data = array(), $httpVerb = 'GET', array $headers = array())
     {
-        $options=array(
+        $options = array(
             'headers'=>$headers,
             'timeout' => 60,
             'exceptions' => false,
         );
 
         $client = new Client();
-        if ($httpVerb=='GET' && count($data)>0) {
-            $url.='?'.http_build_query($data);
+        if ($httpVerb == 'GET' && count($data) > 0) {
+            $url .= '?'.http_build_query($data);
         } else {
-            $options['body']=$data;
+            $options['body'] = $data;
         }
 
-        $request=$client->createRequest($httpVerb, $url, $options);
+        $request = $client->createRequest($httpVerb, $url, $options);
         try {
-            $res=$client->send($request);
-            $response=new Response($res->getBody(), $res->getStatusCode());
+            $res = $client->send($request);
+            $response = new Response($res->getBody(), $res->getStatusCode());
         } catch (RequestException $e) {
             if ($e->hasResponse()) {
-                $response=new Response($res->getBody(), $res->getStatusCode());
+                $response = new Response($res->getBody(), $res->getStatusCode());
             } else {
                 throw $e;
             }

src/Happyr/ApiClient/Http/Request/RequestInterface.php

Spacing +1 added lines, -1 removed lines

@@ -19,6 +19,6 @@
      *
      * @return \Happyr\ApiClient\Http\Response\Response
      */
-    public function send($uri, array $data=array(), $httpVerb='GET', array $headers=array());
+    public function send($uri, array $data = array(), $httpVerb = 'GET', array $headers = array());
 
 }
\ No newline at end of file

src/Happyr/ApiClient/Http/Wsse.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $this->nonce = $this->getRandomString();
 
         // calculate the digest
-        $this->digest = base64_encode(sha1(base64_decode($this->nonce) . $this->created . $this->password, true));
+        $this->digest = base64_encode(sha1(base64_decode($this->nonce).$this->created.$this->password, true));
     }
 
     /**

src/Happyr/ApiClient/HappyrApi.php

Spacing +10 added lines, -10 removed lines

@@ -40,14 +40,14 @@ 
      * @param Configuration $config
      *
      */
-    public function __construct(Configuration $config=null)
+    public function __construct(Configuration $config = null)
     {
         //if we don't get a configuration object in the parameter, then create one now.
-        if ($config==null) {
-            $config=new Configuration();
+        if ($config == null) {
+            $config = new Configuration();
         }
 
-        $this->configuration=$config;
+        $this->configuration = $config;
     }
 
     /**
@@ -59,7 +59,7 @@ 
      *
      * @return \Happyr\ApiClient\Http\Response\Response
      */
-    public function api($uri, array $data=array(), $httpVerb='GET')
+    public function api($uri, array $data = array(), $httpVerb = 'GET')
     {
         return $this->getHttpClient()->sendRequest($uri, $data, $httpVerb);
     }
@@ -76,7 +76,7 @@ 
     protected function getHttpClient($forceNew = false)
     {
         if (!$this->httpClient || $forceNew) {
-            $this->httpClient=new Client($this->configuration);
+            $this->httpClient = new Client($this->configuration);
         }
 
         return $this->httpClient;
@@ -155,8 +155,8 @@ 
      */
     public function getUserToken()
     {
-        $code=$this->getCode();
-        $token=$this->api('user/get-token', array('code'=>$code));
+        $code = $this->getCode();
+        $token = $this->api('user/get-token', array('code'=>$code));
 
         return $token->getBody();
     }
@@ -182,7 +182,7 @@ 
     protected function setState($state)
     {
         if ($state === null) {
-            $_SESSION['happyr_ac_state']=null;
+            $_SESSION['happyr_ac_state'] = null;
         }
 
         $this->state = $state;
@@ -197,7 +197,7 @@ 
     protected function getState()
     {
         if ($this->state === null) {
-            $this->state = isset($_SESSION['happyr_ac_state'])?$_SESSION['happyr_ac_state']:null;
+            $this->state = isset($_SESSION['happyr_ac_state']) ? $_SESSION['happyr_ac_state'] : null;
         }
 
         return $this->state;

src/Happyr/ApiClient/Configuration.php

Spacing +13 added lines, -13 removed lines

@@ -10,16 +10,16 @@ 
 class Configuration
 {
     //your api identifier
-    public $identifier='';
+    public $identifier = '';
 
     //Your api secret
-    public $secret='';
+    public $secret = '';
 
     //must not end with a slash (/)
-    public $baseUrl='http://api.happyr.com';
+    public $baseUrl = 'http://api.happyr.com';
 
     //You should have a good reason not to choose xml.
-    public $format='xml';
+    public $format = 'xml';
 
     /**
      * @var string
@@ -27,29 +27,29 @@ 
      * the class to use when making a http request. The class must implement
      * the Happyr\ApiClient\Http\HttpRequestInterface
      */
-    public $httpRequestClass='\Happyr\ApiClient\Http\Request\Guzzle';
+    public $httpRequestClass = '\Happyr\ApiClient\Http\Request\Guzzle';
 
     //if true, we will throw exceptions on error
-    public $enableExceptions=false;
+    public $enableExceptions = false;
 
     //enables debug mode
-    public $debug=false;
+    public $debug = false;
 
     //The version of this client. This is for our statistics only
-    public $clientVersion=2.0;
+    public $clientVersion = 2.0;
 
     /**
      * @param string $identifier
      * @param string $secret
      */
-    public function __construct($identifier=null, $secret=null)
+    public function __construct($identifier = null, $secret = null)
     {
-        if ($secret!=null) {
-            $this->secret=$secret;
+        if ($secret != null) {
+            $this->secret = $secret;
         }
 
-        if ($identifier!=null) {
-            $this->identifier=$identifier;
+        if ($identifier != null) {
+            $this->identifier = $identifier;
         }
     }
 }
\ No newline at end of file

src/Happyr/ApiClient/Exceptions/HttpException.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function __construct(Response $response)
     {
-        $this->response=$response;
+        $this->response = $response;
         $message = $response->getBody();
         try {
             $xml = @simplexml_load_string($response);
@@ -44,7 +44,7 @@ 
      */
     public function __toString()
     {
-        return $this->getHttpStatus() . ': ' . $this->getMessage();
+        return $this->getHttpStatus().': '.$this->getMessage();
     }
 
     /**
@@ -85,7 +85,7 @@ 
     public function getEmptyResponse()
     {
         $response = clone $this->response;
-        if ($response->getFormat()=='json') {
+        if ($response->getFormat() == 'json') {
             $response->setBody('[]');
         } else {
             $response->setBody('<?xml version="1.0" encoding="UTF-8"?><result/>');