caffeina-core / core

classes/HTTP.php

Indentation +3 added lines, -3 removed lines

@@ -14,9 +14,9 @@
   use Module;
 
   protected static $UA          = "Mozilla/4.0 (compatible; Core::HTTP; Windows NT 6.1)",
-                   $json_data   = false,
-                   $headers     = [],
-                   $last_info   = null;
+                    $json_data   = false,
+                    $headers     = [],
+                    $last_info   = null;
 
   protected static function request($method, $url, $data=[], array $headers=[], $data_as_json=false, $username=null, $password = null){
     $http_method = strtoupper($method);

Spacing +30 added lines, -30 removed lines

@@ -18,7 +18,7 @@ 
                    $headers     = [],
                    $last_info   = null;
 
-  protected static function request($method, $url, $data=[], array $headers=[], $data_as_json=false, $username=null, $password = null){
+  protected static function request($method, $url, $data = [], array $headers = [], $data_as_json = false, $username = null, $password = null) {
     $http_method = strtoupper($method);
     $ch  = curl_init($url);
     $opt = [
@@ -33,26 +33,26 @@ 
       CURLOPT_ENCODING        => '',
     ];
 
-    if($username && $password) {
+    if ($username && $password) {
       $opt[CURLOPT_USERPWD] = "$username:$password";
     }
 
-    $headers = array_merge($headers,static::$headers);
+    $headers = array_merge($headers, static::$headers);
 
-    if($http_method == 'GET'){
-        if($data && is_array($data)){
+    if ($http_method == 'GET') {
+        if ($data && is_array($data)) {
           $tmp                       = [];
           $queried_url               = $url;
-          foreach($data as $key=>$val) $tmp[] = $key.'='.$val;
-          $queried_url               .= (strpos($queried_url,'?') === false) ? '?' : '&';
-          $queried_url               .= implode('&',$tmp);
+          foreach ($data as $key=>$val) $tmp[] = $key.'='.$val;
+          $queried_url               .= (strpos($queried_url, '?') === false) ? '?' : '&';
+          $queried_url               .= implode('&', $tmp);
           $opt[CURLOPT_URL]          = $queried_url;
           $opt[CURLOPT_HTTPGET]      = true;
           unset($opt[CURLOPT_CUSTOMREQUEST]);
         }
     } else {
         $opt[CURLOPT_CUSTOMREQUEST]  = $http_method;
-        if($data_as_json or is_object($data)){
+        if ($data_as_json or is_object($data)) {
           $headers['Content-Type']   = 'application/json';
           $opt[CURLOPT_POSTFIELDS]   = json_encode($data);
         } else {
@@ -60,59 +60,59 @@ 
         }
     }
 
-    curl_setopt_array($ch,$opt);
+    curl_setopt_array($ch, $opt);
     $_harr = [];
-    foreach($headers as $key=>$val)  $_harr[] = $key.': '.$val;
+    foreach ($headers as $key=>$val)  $_harr[] = $key.': '.$val;
     curl_setopt($ch, CURLOPT_HTTPHEADER, $_harr);
     $result = curl_exec($ch);
     $contentType = strtolower(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
     static::$last_info = curl_getinfo($ch);
-    if(false !== strpos($contentType,'json')) $result = json_decode($result);
+    if (false !== strpos($contentType, 'json')) $result = json_decode($result);
     curl_close($ch);
     return $result;
   }
 
-  public static function useJSON($value=null){
-    return $value===null ? static::$json_data : static::$json_data = $value;
+  public static function useJSON($value = null) {
+    return $value === null ? static::$json_data : static::$json_data = $value;
   }
 
-  public static function addHeader($name,$value){
+  public static function addHeader($name, $value) {
     static::$headers[$name] = $value;
   }
 
-  public static function removeHeader($name){
+  public static function removeHeader($name) {
     unset(static::$headers[$name]);
   }
 
-  public static function headers($name=null){
+  public static function headers($name = null) {
     // null === $name ?? static::$headers ?? static::$headers[$name]
     return null === $name
            ? static::$headers
-           : ( isset(static::$headers[$name]) ? static::$headers[$name] : '' );
+           : (isset(static::$headers[$name]) ? static::$headers[$name] : '');
   }
 
-  public static function userAgent($value=null){
-    return $value===null ? static::$UA : static::$UA = $value;
+  public static function userAgent($value = null) {
+    return $value === null ? static::$UA : static::$UA = $value;
   }
 
-  public static function get($url, $data=null, array $headers=[], $username = null, $password = null){
-    return static::request('get',$url,$data,$headers,false,$username,$password);
+  public static function get($url, $data = null, array $headers = [], $username = null, $password = null) {
+    return static::request('get', $url, $data, $headers, false, $username, $password);
   }
 
-  public static function post($url, $data=null, array $headers=[], $username = null, $password = null){
-    return static::request('post',$url,$data,$headers,static::$json_data,$username,$password);
+  public static function post($url, $data = null, array $headers = [], $username = null, $password = null) {
+    return static::request('post', $url, $data, $headers, static::$json_data, $username, $password);
   }
 
-  public static function put($url, $data=null, array $headers=[], $username = null, $password = null){
-    return static::request('put',$url,$data,$headers,static::$json_data,$username,$password);
+  public static function put($url, $data = null, array $headers = [], $username = null, $password = null) {
+    return static::request('put', $url, $data, $headers, static::$json_data, $username, $password);
   }
 
-  public static function delete($url, $data=null, array $headers=[], $username = null, $password = null){
-    return static::request('delete',$url,$data,$headers,static::$json_data,$username,$password);
+  public static function delete($url, $data = null, array $headers = [], $username = null, $password = null) {
+    return static::request('delete', $url, $data, $headers, static::$json_data, $username, $password);
   }
 
-  public static function info($url = null){
-    if ($url){
+  public static function info($url = null) {
+    if ($url) {
       curl_setopt_array($ch = curl_init($url), [
         CURLOPT_SSL_VERIFYHOST  => false,
         CURLOPT_CONNECTTIMEOUT  => 10,

Braces +18 added lines, -16 removed lines

@@ -18,7 +18,7 @@ 
                    $headers     = [],
                    $last_info   = null;
 
-  protected static function request($method, $url, $data=[], array $headers=[], $data_as_json=false, $username=null, $password = null){
+  protected static function request($method, $url, $data=[], array $headers=[], $data_as_json=false, $username=null, $password = null) {
     $http_method = strtoupper($method);
     $ch  = curl_init($url);
     $opt = [
@@ -39,8 +39,8 @@ 
 
     $headers = array_merge($headers,static::$headers);
 
-    if($http_method == 'GET'){
-        if($data && is_array($data)){
+    if($http_method == 'GET') {
+        if($data && is_array($data)) {
           $tmp                       = [];
           $queried_url               = $url;
           foreach($data as $key=>$val) $tmp[] = $key.'='.$val;
@@ -52,7 +52,7 @@ 
         }
     } else {
         $opt[CURLOPT_CUSTOMREQUEST]  = $http_method;
-        if($data_as_json or is_object($data)){
+        if($data_as_json or is_object($data)) {
           $headers['Content-Type']   = 'application/json';
           $opt[CURLOPT_POSTFIELDS]   = json_encode($data);
         } else {
@@ -67,52 +67,54 @@ 
     $result = curl_exec($ch);
     $contentType = strtolower(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
     static::$last_info = curl_getinfo($ch);
-    if(false !== strpos($contentType,'json')) $result = json_decode($result);
+    if(false !== strpos($contentType,'json')) {
+      $result = json_decode($result);
+    }
     curl_close($ch);
     return $result;
   }
 
-  public static function useJSON($value=null){
+  public static function useJSON($value=null) {
     return $value===null ? static::$json_data : static::$json_data = $value;
   }
 
-  public static function addHeader($name,$value){
+  public static function addHeader($name,$value) {
     static::$headers[$name] = $value;
   }
 
-  public static function removeHeader($name){
+  public static function removeHeader($name) {
     unset(static::$headers[$name]);
   }
 
-  public static function headers($name=null){
+  public static function headers($name=null) {
     // null === $name ?? static::$headers ?? static::$headers[$name]
     return null === $name
            ? static::$headers
            : ( isset(static::$headers[$name]) ? static::$headers[$name] : '' );
   }
 
-  public static function userAgent($value=null){
+  public static function userAgent($value=null) {
     return $value===null ? static::$UA : static::$UA = $value;
   }
 
-  public static function get($url, $data=null, array $headers=[], $username = null, $password = null){
+  public static function get($url, $data=null, array $headers=[], $username = null, $password = null) {
     return static::request('get',$url,$data,$headers,false,$username,$password);
   }
 
-  public static function post($url, $data=null, array $headers=[], $username = null, $password = null){
+  public static function post($url, $data=null, array $headers=[], $username = null, $password = null) {
     return static::request('post',$url,$data,$headers,static::$json_data,$username,$password);
   }
 
-  public static function put($url, $data=null, array $headers=[], $username = null, $password = null){
+  public static function put($url, $data=null, array $headers=[], $username = null, $password = null) {
     return static::request('put',$url,$data,$headers,static::$json_data,$username,$password);
   }
 
-  public static function delete($url, $data=null, array $headers=[], $username = null, $password = null){
+  public static function delete($url, $data=null, array $headers=[], $username = null, $password = null) {
     return static::request('delete',$url,$data,$headers,static::$json_data,$username,$password);
   }
 
-  public static function info($url = null){
-    if ($url){
+  public static function info($url = null) {
+    if ($url) {
       curl_setopt_array($ch = curl_init($url), [
         CURLOPT_SSL_VERIFYHOST  => false,
         CURLOPT_CONNECTTIMEOUT  => 10,