majiameng / tools

src/HttpRequest.php

Spacing +27 added lines, -27 removed lines

@@ -33,19 +33,19 @@ 
      * @return mixed
      * @throws \Exception
      */
-    static public function httpPost($url, $param = array(), $httpHeaders = array(),$proxy='', $http_code = null)
+    static public function httpPost($url, $param = array(), $httpHeaders = array(), $proxy = '', $http_code = null)
     {
         /** 参数检测,object或者array进行http_build_query */
-        if(!empty($param) && is_array($param)){
+        if (!empty($param) && is_array($param)) {
             $flag = false;
-            foreach ($param as $value){
+            foreach ($param as $value) {
                 //判断参数是否是一个对象 或者 是一个数组
-                if(is_array($value) || (is_string($value) && is_object($value))){
+                if (is_array($value) || (is_string($value) && is_object($value))) {
                     $flag = true;
                     break;
                 }
             }
-            if($flag == true){
+            if ($flag == true) {
                 $param = http_build_query($param);
             }
         }
@@ -62,12 +62,12 @@ 
         curl_setopt($curl, CURLOPT_POSTFIELDS, $param);
 
         /** 设置请求headers */
-        if(empty($httpHeaders)){
+        if (empty($httpHeaders)) {
             $httpHeaders = array(
                 "user-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36"
             );
         }
-        if (is_array($httpHeaders)){
+        if (is_array($httpHeaders)) {
             curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
         }
         /** gzip压缩 */
@@ -81,11 +81,11 @@ 
         }
 
         /** http代理 */
-        if(!empty($proxy)){
-            $proxy = explode(':',$proxy);
+        if (!empty($proxy)) {
+            $proxy = explode(':', $proxy);
             curl_setopt($curl, CURLOPT_PROXYAUTH, CURLAUTH_BASIC); //代理认证模式
             curl_setopt($curl, CURLOPT_PROXY, "$proxy[0]"); //代理服务器地址
-            curl_setopt($curl, CURLOPT_PROXYPORT,$proxy[1]); //代理服务器端口
+            curl_setopt($curl, CURLOPT_PROXYPORT, $proxy[1]); //代理服务器端口
         }
 
         /** 请求 */
@@ -95,20 +95,20 @@ 
         /** 关闭请求资源 */
         curl_close($curl);
 
-        if($http_code != null){
+        if ($http_code != null) {
             /** 验证网络请求状态 */
             if (intval($info["http_code"]) === 0) {
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpPost]: POST request was aborted ! Request url :' . $url . ' , post request data : ' . var_export($param,true)
+                    '[httpPost]: POST request was aborted ! Request url :'.$url.' , post request data : '.var_export($param, true)
                 );
-            }elseif(intval($info["http_code"]) != $http_code){
+            }elseif (intval($info["http_code"]) != $http_code) {
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpPost]: POST request was aborted ! Request url :' . $url . ' , post request data : ' . var_export($param,true).' ,return code : '.$info["http_code"] .' ,return content : '.$content
+                    '[httpPost]: POST request was aborted ! Request url :'.$url.' , post request data : '.var_export($param, true).' ,return code : '.$info["http_code"].' ,return content : '.$content
                 );
             } else {
                 return $content;
             }
-        }else{
+        } else {
             return $content;
         }
     }
@@ -125,13 +125,13 @@ 
      * @return mixed
      * @throws \Exception
      */
-    static public function httpGet($url, $param = array(), $httpHeaders = array(),$proxy= '',  $http_code = 200)
+    static public function httpGet($url, $param = array(), $httpHeaders = array(), $proxy = '', $http_code = 200)
     {
         $curl = curl_init();
 
         /** 设置请求参数 */
         if (!empty($param)) {
-            $url = $url . '?' . http_build_query($param);
+            $url = $url.'?'.http_build_query($param);
         }
 
         /** 设置请求链接 */
@@ -147,20 +147,20 @@ 
         }
 
         /** http代理 */
-        if(!empty($proxy)){
-            $proxy = explode(':',$proxy);
+        if (!empty($proxy)) {
+            $proxy = explode(':', $proxy);
             curl_setopt($curl, CURLOPT_PROXYAUTH, CURLAUTH_BASIC); //代理认证模式
             curl_setopt($curl, CURLOPT_PROXY, "$proxy[0]"); //代理服务器地址
-            curl_setopt($curl, CURLOPT_PROXYPORT,$proxy[1]); //代理服务器端口
+            curl_setopt($curl, CURLOPT_PROXYPORT, $proxy[1]); //代理服务器端口
         }
 
         /** 设置请求headers */
-        if(empty($httpHeaders)){
+        if (empty($httpHeaders)) {
             $httpHeaders = array(
                 "user-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36"
             );
         }
-        if (is_array($httpHeaders)){
+        if (is_array($httpHeaders)) {
             curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
         }
         /** gzip压缩 */
@@ -174,19 +174,19 @@ 
         curl_close($curl);
 
         /** 验证网络请求状态 */
-        if($http_code != null){
+        if ($http_code != null) {
             if (intval($info["http_code"]) === 0) {
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpGet]: GET request was aborted ! Request url :' . $url
+                    '[httpGet]: GET request was aborted ! Request url :'.$url
                 );
-            }elseif(intval($info["http_code"]) != $http_code){
+            }elseif (intval($info["http_code"]) != $http_code) {
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpGet]: GET request was aborted ! Request url :' . $url .' ,return code : '.$info["http_code"] .' ,return content : '.$content
+                    '[httpGet]: GET request was aborted ! Request url :'.$url.' ,return code : '.$info["http_code"].' ,return content : '.$content
                 );
             } else {
                 return $content;
             }
-        }else{
+        } else {
             return $content;
         }
     }

Braces +4 added lines, -4 removed lines

@@ -101,14 +101,14 @@ 
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
                     '[httpPost]: POST request was aborted ! Request url :' . $url . ' , post request data : ' . var_export($param,true)
                 );
-            }elseif(intval($info["http_code"]) != $http_code){
+            } elseif(intval($info["http_code"]) != $http_code){
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
                     '[httpPost]: POST request was aborted ! Request url :' . $url . ' , post request data : ' . var_export($param,true).' ,return code : '.$info["http_code"] .' ,return content : '.$content
                 );
             } else {
                 return $content;
             }
-        }else{
+        } else{
             return $content;
         }
     }
@@ -179,14 +179,14 @@ 
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
                     '[httpGet]: GET request was aborted ! Request url :' . $url
                 );
-            }elseif(intval($info["http_code"]) != $http_code){
+            } elseif(intval($info["http_code"]) != $http_code){
                 throw new TException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
                     '[httpGet]: GET request was aborted ! Request url :' . $url .' ,return code : '.$info["http_code"] .' ,return content : '.$content
                 );
             } else {
                 return $content;
             }
-        }else{
+        } else{
             return $content;
         }
     }

src/ArrayTool.php

Spacing +22 added lines, -22 removed lines

@@ -8,7 +8,7 @@ 
  * Description: Tool.php.
  */
 
-class ArrayTool{
+class ArrayTool {
 
     /**
      * @param $arr
@@ -16,20 +16,20 @@ 
      * @param $type
      * @return array
      */
-    static public function arraySort($arr,$keys,$type='asc'){
+    static public function arraySort($arr, $keys, $type = 'asc') {
         $keysValue = $newArray = array();
-        foreach ($arr as $k=>$v){
-            if(isset($v[$keys])){
+        foreach ($arr as $k=>$v) {
+            if (isset($v[$keys])) {
                 $keysValue[$k] = $v[$keys];
             }
         }
-        if($type == 'asc'){
+        if ($type == 'asc') {
             asort($keysValue);
-        }else{
+        } else {
             arsort($keysValue);
         }
         reset($keysValue);
-        foreach ($keysValue as $k=>$v){
+        foreach ($keysValue as $k=>$v) {
             $newArray[$k] = $arr[$k];
         }
         return array_values($newArray);
@@ -45,13 +45,13 @@ 
      * @param int $parent_id 父id值
      * @return array
      */
-    public static function getTreeStructure($list,$filed='id',$parent_filed='pid',$parent_id=0){
+    public static function getTreeStructure($list, $filed = 'id', $parent_filed = 'pid', $parent_id = 0) {
         $result = array();
-        if(!empty($list)){
-            foreach($list as $key=>$val){
-                if($val[$parent_filed] == $parent_id){
-                    $val['child'] = self::getTreeStructure($list,$filed,$parent_filed,$val[$filed]);
-                    if(empty($val['child'])){
+        if (!empty($list)) {
+            foreach ($list as $key=>$val) {
+                if ($val[$parent_filed] == $parent_id) {
+                    $val['child'] = self::getTreeStructure($list, $filed, $parent_filed, $val[$filed]);
+                    if (empty($val['child'])) {
                         unset($val['child']);
                     }
                     $result[] = $val;
@@ -68,12 +68,12 @@ 
      * @param $obj
      * @return array
      */
-    public static function objectToArray($obj){
-        if(!is_object($obj) && !is_array($obj)) {
+    public static function objectToArray($obj) {
+        if (!is_object($obj) && !is_array($obj)) {
             return $obj;
         }
         $arr = array();
-        foreach($obj as $k => $v){
+        foreach ($obj as $k => $v) {
             $arr[$k] = self::objectToArray($v);
         }
         return $arr;
@@ -85,12 +85,12 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @param $data
      */
-    public static function nullArrayToObject(&$data){
-        foreach ($data as $key=>&$val){
-            if(is_array($val)){
-                if(empty($val)){
-                    settype($val,'object');
-                }else{
+    public static function nullArrayToObject(&$data) {
+        foreach ($data as $key=>&$val) {
+            if (is_array($val)) {
+                if (empty($val)) {
+                    settype($val, 'object');
+                } else {
                     self::nullArrayToObject($val);
                 }
             }