dshovchko / php_UAPAY

src/Request.php

Spacing +14 added lines, -14 removed lines

@@ -16,7 +16,7 @@ 
     /**
      *      @var array
      */
-    protected $jwt=array(
+    protected $jwt = array(
         'using'         => false,
         'UAPAY_pubkey'  => '',
         'our_privkey'   => '',
@@ -36,7 +36,7 @@ 
     public function __construct($options)
     {
         // api_url
-        if ( ! isset($options['api_uri']))
+        if (!isset($options['api_uri']))
         {
             throw new Exception\Data('parameter api_uri is not specified');
         }
@@ -44,21 +44,21 @@ 
         if (isset($options['jwt']))
         {
             // using
-            if ( ! isset($options['jwt']['using']))
+            if (!isset($options['jwt']['using']))
             {
                 throw new Exception\Data('parameter jwt/using is not specified');
             }
-            if ( ! is_bool($options['jwt']['using']))
+            if (!is_bool($options['jwt']['using']))
             {
                 throw new Exception\Data('parameter jwt/using is incorrect');
             }
             // using
-            if ( ! isset($options['jwt']['UAPAY_pubkey']))
+            if (!isset($options['jwt']['UAPAY_pubkey']))
             {
                 throw new Exception\Data('parameter jwt/UAPAY_pubkey is not specified');
             }
             // using
-            if ( ! isset($options['jwt']['our_privkey']))
+            if (!isset($options['jwt']['our_privkey']))
             {
                 throw new Exception\Data('parameter jwt/our_privkey is not specified');
             }
@@ -79,7 +79,7 @@ 
      *      @param array $value
      *      @return array
      */
-    public function data($value=null)
+    public function data($value = null)
     {
         if ($value !== null)
         {
@@ -95,9 +95,9 @@ 
      *      @param mixed $value
      *      @return string
      */
-    protected function as_string($value=null)
+    protected function as_string($value = null)
     {
-        return (is_scalar($value))?((is_bool($value))?(($value)?'true':'false'):"$value"):null;
+        return (is_scalar($value)) ? ((is_bool($value)) ? (($value) ? 'true' : 'false') : "$value") : null;
     }
 
     /**
@@ -106,9 +106,9 @@ 
      *      @param mixed $value
      *      @return integer
      */
-    protected function as_int($value=null)
+    protected function as_int($value = null)
     {
-        return (is_int($value))?$value:null;
+        return (is_int($value)) ? $value : null;
     }
 
     /**
@@ -117,9 +117,9 @@ 
      *      @param mixed $value
      *      @return array
      */
-    protected function as_array($value=null)
+    protected function as_array($value = null)
     {
-        return (is_array($value))?$value:null;
+        return (is_array($value)) ? $value : null;
     }
 
     /**
@@ -181,7 +181,7 @@ 
     protected function own_private_key()
     {
         // check private key file
-        if ( ! file_exists($this->jwt['our_privkey']))
+        if (!file_exists($this->jwt['our_privkey']))
         {
             throw new Exception\Runtime('The file with the private key was not find!');
         }

Braces +5 added lines, -5 removed lines

@@ -162,7 +162,9 @@ 
             $payload['iat'] = $this->get_param_iat();
             $ar['token'] = $this->token_encode($payload);
 
-            if (isset($ar['data'])) unset($ar['data']);
+            if (isset($ar['data'])) {
+                unset($ar['data']);
+            }
         }
         $json = json_encode($ar, JSON_UNESCAPED_SLASHES);
 
@@ -216,8 +218,7 @@ 
         try
         {
             $token = JWT::encode($payload, $this->own_private_key(), 'RS512');
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             Log::instance()->error($e->getMessage().PHP_EOL.$e->getTraceAsString());
             throw new Exception\JSON('unable to create JWT token', $e);
@@ -247,8 +248,7 @@ 
             $body = $httpresponse->getBody()->getContents();
             Log::instance()->debug('got response:'.PHP_EOL.$body);
             $response = new $this->response_class($body, $this->jwt);
-        }
-        catch (\GuzzleHttp\Exception\TransferException $e)
+        } catch (\GuzzleHttp\Exception\TransferException $e)
         {
             Log::instance()->debug('request:'.PHP_EOL.\GuzzleHttp\Psr7\str($e->getRequest()));
             if ($e->hasResponse()) {

src/Response.php

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
     /**
      *      @var array
      */
-    protected $jwt=array(
+    protected $jwt = array(
         'using'         => false,
         'UAPAY_pubkey'  => '',
         'our_privkey'   => '',
@@ -33,7 +33,7 @@ 
      *      @param array $json_string JSON string
      *      @param array $jwt_options array of options
      */
-    public function __construct($json_string, $jwt_options=null)
+    public function __construct($json_string, $jwt_options = null)
     {
         if (isset($jwt_options) && is_array($jwt_options))
         {
@@ -71,7 +71,7 @@ 
         {
             throw new Exception\JSON('json response contain an error message!');
         }
-        if ( ! isset($this->json['status']))
+        if (!isset($this->json['status']))
         {
             throw new Exception\JSON('invalid json response!');
         }
@@ -81,14 +81,14 @@ 
         }
         $this->status = $this->json['status'];
 
-        if ( ! isset($this->json['data']) || !is_array($this->json['data']))
+        if (!isset($this->json['data']) || !is_array($this->json['data']))
         {
             throw new Exception\JSON('json does not contain the data field!');
         }
 
         if ($this->jwt['using'] === true)
         {
-            if ( ! isset($this->json['data']['token']))
+            if (!isset($this->json['data']['token']))
             {
                 throw new Exception\JSON('data does not contain the token field!');
             }
@@ -106,7 +106,7 @@ 
     protected function uapay_public_key()
     {
         // check public key file
-        if ( ! file_exists($this->jwt['UAPAY_pubkey']))
+        if (!file_exists($this->jwt['UAPAY_pubkey']))
         {
             throw new Exception\Runtime('The file with the public key was not find!');
         }

Braces +1 added lines, -2 removed lines

@@ -139,8 +139,7 @@
         try
         {
             $decoded = (array) JWT::decode($token, $this->uapay_public_key(), array('RS512'));
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             Log::instance()->error($e->getMessage().PHP_EOL.$e->getTraceAsString());
             throw new Exception\JSON('unable to decode JWT token', $e);