majiameng / tools

src/ArrayTool.php

Spacing +21 added lines, -21 removed lines

@@ -8,7 +8,7 @@ 
  * Description: Tool.php.
  */
 
-class ArrayTool{
+class ArrayTool {
 
     /**
      * @param $arr
@@ -16,18 +16,18 @@ 
      * @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){
+        foreach ($arr as $k=>$v) {
             $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 $newArray;
@@ -43,13 +43,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;
@@ -66,12 +66,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;
@@ -83,12 +83,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);
                 }
             }

Braces +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
         }
         if($type == 'asc'){
             asort($keysValue);
-        }else{
+        } else{
             arsort($keysValue);
         }
         reset($keysValue);
@@ -88,7 +88,7 @@ 
             if(is_array($val)){
                 if(empty($val)){
                     settype($val,'object');
-                }else{
+                } else{
                     self::nullArrayToObject($val);
                 }
             }

src/Tool.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
  * Description: Tool.php.
  */
 
-class Tool{
+class Tool {
 
     /**
      * Description:  获取ip
@@ -16,14 +16,14 @@ 
      * Updater:
      * @return string
      */
-    public static function getIp(){
-        if(!empty($_SERVER["HTTP_CLIENT_IP"])){
+    public static function getIp() {
+        if (!empty($_SERVER["HTTP_CLIENT_IP"])) {
             $cip = $_SERVER["HTTP_CLIENT_IP"];
-        }else if(!empty($_SERVER["HTTP_X_FORWARDED_FOR"])){
+        } else if (!empty($_SERVER["HTTP_X_FORWARDED_FOR"])) {
             $cip = $_SERVER["HTTP_X_FORWARDED_FOR"];
-        }else if(!empty($_SERVER["REMOTE_ADDR"])){
+        } else if (!empty($_SERVER["REMOTE_ADDR"])) {
             $cip = $_SERVER["REMOTE_ADDR"];
-        }else{
+        } else {
             $cip = '';
         }
         preg_match("/[\d\.]{7,15}/", $cip, $cips);
@@ -88,7 +88,7 @@ 
                 'mobile'
             );
             // 从HTTP_USER_AGENT中查找手机浏览器的关键字
-            if (preg_match("/(" . implode('|', $clientKeyWords) . ")/i", strtolower($_SERVER['HTTP_USER_AGENT']))) {
+            if (preg_match("/(".implode('|', $clientKeyWords).")/i", strtolower($_SERVER['HTTP_USER_AGENT']))) {
                 return true;
             }
         }

Braces +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@
     public static function getIp(){
         if(!empty($_SERVER["HTTP_CLIENT_IP"])){
             $cip = $_SERVER["HTTP_CLIENT_IP"];
-        }else if(!empty($_SERVER["HTTP_X_FORWARDED_FOR"])){
+        } else if(!empty($_SERVER["HTTP_X_FORWARDED_FOR"])){
             $cip = $_SERVER["HTTP_X_FORWARDED_FOR"];
-        }else if(!empty($_SERVER["REMOTE_ADDR"])){
+        } else if(!empty($_SERVER["REMOTE_ADDR"])){
             $cip = $_SERVER["REMOTE_ADDR"];
-        }else{
+        } else{
             $cip = '';
         }
         preg_match("/[\d\.]{7,15}/", $cip, $cips);