lifeboat-app / php-sdk

src/services/Curl.php

Spacing +12 added lines, -12 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);
         }
@@ -244,9 +244,9 @@ 
     {
         if (!self::is_absolute_url($url)) {
             $isRelative = true;
-            $uri = 'http://dummy.com/' . ltrim($url, '/'); 
+            $uri = 'http://dummy.com/'.ltrim($url, '/'); 
             throw new InvalidArgumentException('Curl::setGetVar() requires $url to be an absolute url');
-        } else {
+        }else {
             $isRelative = false;
             $uri = $url;
         }
@@ -254,7 +254,7 @@ 
         // try to parse uri
         $parts = parse_url($uri);
         if (!$parts) {
-            throw new InvalidArgumentException("Can't parse URL: " . $uri);
+            throw new InvalidArgumentException("Can't parse URL: ".$uri);
         }
 
         // Parse params and add new variable
@@ -270,21 +270,21 @@ 
 
         if ($user != '') {
             // format in either user:pass@host.com or user@host.com
-            $user .= (isset($parts['pass']) && $parts['pass'] != '') ? ':' . $parts['pass'] . '@' : '@';
+            $user .= (isset($parts['pass']) && $parts['pass'] != '') ? ':'.$parts['pass'].'@' : '@';
         }
 
         $host = (isset($parts['host'])) ? $parts['host'] : '';
-        $port = (isset($parts['port']) && $parts['port'] != '') ? ':' . $parts['port'] : '';
+        $port = (isset($parts['port']) && $parts['port'] != '') ? ':'.$parts['port'] : '';
         $path = (isset($parts['path']) && $parts['path'] != '') ? $parts['path'] : '';
 
         // handle URL params which are existing / new
-        $params = ($params) ? '?' . http_build_query($params, null, $separator) : '';
+        $params = ($params) ? '?'.http_build_query($params, null, $separator) : '';
 
         // keep fragments (anchors) intact.
-        $fragment = (isset($parts['fragment']) && $parts['fragment'] != '') ? '#' . $parts['fragment'] : '';
+        $fragment = (isset($parts['fragment']) && $parts['fragment'] != '') ? '#'.$parts['fragment'] : '';
 
         // Recompile URI segments
-        $newUri = $scheme . '://' . $user . $host . $port . $path . $params . $fragment;
+        $newUri = $scheme.'://'.$user.$host.$port.$path.$params.$fragment;
 
         if ($isRelative) {
             return str_replace('http://dummy.com/', '', $newUri);
@@ -301,10 +301,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, '/');

Braces +27 added lines, -9 removed lines

@@ -38,9 +38,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);
+        }
     }
 
     /**
@@ -97,7 +103,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;
     }
 
@@ -126,7 +134,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;
     }
 
@@ -170,13 +180,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 = $this->setGetVar($name, $value, $request_uri);
+                foreach ($this->getDataParams() as $name => $value) {
+                    $request_uri = $this->setGetVar($name, $value, $request_uri);
+                }
                 break;
 
             case 'POST':
@@ -207,7 +221,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);
@@ -217,7 +233,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;
     }