lifeboat-app / php-sdk

src/services/Curl.php

Spacing +2 added lines, -2 removed lines

@@ -188,7 +188,7 @@ 
         }
 
         if ($this->_enable_cache && $this->getMethod() === 'GET') {
-            $cache_key = urlencode($request_uri) . implode(',', $send_headers);
+            $cache_key = urlencode($request_uri).implode(',', $send_headers);
             if (array_key_exists($cache_key, self::$_cache)) {
                 return self::$_cache[$cache_key];
             }
@@ -208,7 +208,7 @@ 
         curl_setopt($ch, CURLOPT_AUTOREFERER, true);
 
         if (!empty($send_headers))  curl_setopt($ch, CURLOPT_HTTPHEADER, $send_headers);
-        if (!is_null($post_data))   {
+        if (!is_null($post_data)) {
             curl_setopt($ch, CURLOPT_POST, 1);
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data);
         }

Braces +27 added lines, -9 removed lines

@@ -39,9 +39,15 @@ 
      */
     public function __construct(string $url = null, array $data = [], array $headers = [])
     {
-        if (!is_null($url)) $this->setURL($url);
-        foreach ($data as $name => $value)      $this->addDataParam($name, $value);
-        foreach ($headers as $name => $value)   $this->addHeader($name, $value);
+        if (!is_null($url)) {
+            $this->setURL($url);
+        }
+        foreach ($data as $name => $value) {
+            $this->addDataParam($name, $value);
+        }
+        foreach ($headers as $name => $value) {
+            $this->addHeader($name, $value);
+        }
     }
 
     /**
@@ -98,7 +104,9 @@ 
 
     public function removeDataParam(string $name): Curl
     {
-        if (array_key_exists($name, $this->_data)) unset($this->_data[$name]);
+        if (array_key_exists($name, $this->_data)) {
+            unset($this->_data[$name]);
+        }
         return $this;
     }
 
@@ -127,7 +135,9 @@ 
      */
     public function removeHeader(string $name): Curl
     {
-        if (array_key_exists($name, $this->_headers)) unset($this->_headers[$name]);
+        if (array_key_exists($name, $this->_headers)) {
+            unset($this->_headers[$name]);
+        }
         return $this;
     }
 
@@ -171,13 +181,17 @@ 
         $request_uri    = $this->getURL();
 
         //  Headers
-        foreach ($this->getHeaders() as $k => $v) $send_headers[] = "{$k}: {$v}";
+        foreach ($this->getHeaders() as $k => $v) {
+            $send_headers[] = "{$k}: {$v}";
+        }
 
         // Request Data
         switch ($this->getMethod()) {
             case 'GET':
             case 'DELETE':
-                foreach ($this->getDataParams() as $name => $value) $request_uri = URL::setGetVar($name, $value, $request_uri);
+                foreach ($this->getDataParams() as $name => $value) {
+                    $request_uri = URL::setGetVar($name, $value, $request_uri);
+                }
                 break;
 
             case 'POST':
@@ -208,7 +222,9 @@ 
         curl_setopt($ch, CURLINFO_HEADER_OUT, true);
         curl_setopt($ch, CURLOPT_AUTOREFERER, true);
 
-        if (!empty($send_headers))  curl_setopt($ch, CURLOPT_HTTPHEADER, $send_headers);
+        if (!empty($send_headers)) {
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $send_headers);
+        }
         if (!is_null($post_data))   {
             curl_setopt($ch, CURLOPT_POST, 1);
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data);
@@ -218,7 +234,9 @@ 
         $http_code  = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 
         $response = new CurlResponse($http_code, $result);
-        if ($this->_enable_cache && isset($cache_key)) self::$_cache[$cache_key] = $response;
+        if ($this->_enable_cache && isset($cache_key)) {
+            self::$_cache[$cache_key] = $response;
+        }
 
         return $response;
     }

src/CurlResponse.php

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
     public function getJSON(): ?array
     {
         $data = json_decode($this->result, true);
-        if (!is_array($data)) return null;
+        if (!is_array($data)) {
+            return null;
+        }
         
         return $data;
     }

src/Client.php

Spacing +1 added lines, -1 removed lines

@@ -96,6 +96,6 @@
      */
     private function auth_url(string $path): string
     {
-        return $this->_auth_domain . '/' . ltrim($path, '/');
+        return $this->_auth_domain.'/'.ltrim($path, '/');
     }
 }

Braces +3 added lines, -1 removed lines

@@ -67,7 +67,9 @@
      */
     public function getSites(string $access_token = ''): array
     {
-        if (!$access_token) $access_token = $this->getAccessToken();
+        if (!$access_token) {
+            $access_token = $this->getAccessToken();
+        }
 
         $curl = new Curl($this->auth_url(self::SITES_URL), [
             'access_token' => $access_token

src/utils/URL.php

Spacing +8 added lines, -8 removed lines

@@ -20,13 +20,13 @@ 
     public static function setGetVar(string $key, string $value, string $url): string
     {
         if (!self::is_absolute_url($url)) {
-            $url = 'http://dummy.com/' . ltrim($url, '/');
+            $url = 'http://dummy.com/'.ltrim($url, '/');
         }
 
         // try to parse uri
         $parts = parse_url($url);
         if (empty($parts)) {
-            throw new InvalidArgumentException("Can't parse URL: " . $url);
+            throw new InvalidArgumentException("Can't parse URL: ".$url);
         }
 
         // Parse params and add new variable
@@ -40,18 +40,18 @@ 
         // Generate URI segments and formatting
         $scheme = (array_key_exists('scheme', $parts)) ? $parts['scheme'] : 'http';
         $user = (array_key_exists('user', $parts)) ? $parts['user'] : '';
-        $port = (array_key_exists('port', $parts) && $parts['port']) ? ':' . $parts['port'] : '';
+        $port = (array_key_exists('port', $parts) && $parts['port']) ? ':'.$parts['port'] : '';
 
         if ($user != '') {
             // format in either user:pass@host.com or user@host.com
-            $user .= (array_key_exists('pass', $parts) && $parts['pass']) ? ':' . $parts['pass'] . '@' : '';
+            $user .= (array_key_exists('pass', $parts) && $parts['pass']) ? ':'.$parts['pass'].'@' : '';
         }
 
         // handle URL params which are existing / new
-        $params = ($params) ? '?' . http_build_query($params) : '';
+        $params = ($params) ? '?'.http_build_query($params) : '';
 
         // Recompile URI segments
-        $newUri = $scheme . '://' . $user . $parts['host'] . $port . $parts['path'] . $params;
+        $newUri = $scheme.'://'.$user.$parts['host'].$port.$parts['path'].$params;
 
         return str_replace('http://dummy.com/', '', $newUri);
     }
@@ -64,10 +64,10 @@ 
     {
         // Strip off the query and fragment parts of the URL before checking
         if (($queryPosition = strpos($url, '?')) !== false) {
-            $url = substr($url, 0, $queryPosition - 1);
+            $url = substr($url, 0, $queryPosition-1);
         }
         if (($hashPosition = strpos($url, '#')) !== false) {
-            $url = substr($url, 0, $hashPosition - 1);
+            $url = substr($url, 0, $hashPosition-1);
         }
         $colonPosition = strpos($url, ':');
         $slashPosition = strpos($url, '/');

src/App.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
 
         if (!$response->isValid() || !$json || !array_key_exists('access_token', $json)) {
             $promise->reject($response->getRaw());
-        } else {
+        }else {
             $promise->resolve($json['access_token']);
         }
 
@@ -124,6 +124,6 @@ 
      */
     private function auth_url(string $path): string
     {
-        return $this->_auth_domain . '/' . ltrim($path, '/');
+        return $this->_auth_domain.'/'.ltrim($path, '/');
     }
 }

Braces +3 added lines, -1 removed lines

@@ -44,7 +44,9 @@
      */
     public function getAPIChallenge(): string
     {
-        if (!$this->_api_challenge) $this->_api_challenge = Utils::create_random_string(128);
+        if (!$this->_api_challenge) {
+            $this->_api_challenge = Utils::create_random_string(128);
+        }
         return $this->_api_challenge;
     }
 

src/utils/Utils.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
         $randomString = '';
 
         for ($i = 0; $i < $length; $i++) {
-            $randomString .= $characters[rand(0, $charactersLength - 1)];
+            $randomString .= $characters[rand(0, $charactersLength-1)];
         }
 
         return $randomString;
@@ -29,6 +29,6 @@ 
      */
     public static function pack(string $str): string
     {
-        return rtrim(strtr(base64_encode(pack('H*',  hash('sha256', $str))), '+/', '-_'), '=');
+        return rtrim(strtr(base64_encode(pack('H*', hash('sha256', $str))), '+/', '-_'), '=');
     }
 }