GC0202 / ThinkLibrary

src/service/QqWryService.php

Spacing +34 added lines, -34 removed lines

@@ -79,10 +79,10 @@ 
             throw new DtaException('请检查配置文件是否配置了IP数据库文件存放位置');
         }
         $this->fp = 0;
-        if (($this->fp = fopen($this->ipPath . 'qqwry.dat', 'rb')) !== false) {
+        if (($this->fp = fopen($this->ipPath.'qqwry.dat', 'rb')) !== false) {
             $this->firstIp = $this->getLong();
             $this->lastIp = $this->getLong();
-            $this->totalIp = ($this->lastIp - $this->firstIp) / 7;
+            $this->totalIp = ($this->lastIp-$this->firstIp)/7;
         }
         parent::__construct($app);
     }
@@ -163,49 +163,49 @@ 
                 // 如果数据文件没有被正确打开，则直接返回错误
                 throw new DtaException('数据库文件不存在!');
             }
-            $location['ip'] = $ip;   // 将输入的域名转化为IP地址
-            $ip = $this->packIp($location['ip']);   // 将输入的IP地址转化为可比较的IP地址
+            $location['ip'] = $ip; // 将输入的域名转化为IP地址
+            $ip = $this->packIp($location['ip']); // 将输入的IP地址转化为可比较的IP地址
             // 不合法的IP地址会被转化为255.255.255.255
             // 对分搜索
-            $l = 0;                         // 搜索的下边界
-            $u = $this->totalIp;            // 搜索的上边界
-            $findip = $this->lastIp;        // 如果没有找到就返回最后一条IP记录（QQWry.Dat的版本信息）
+            $l = 0; // 搜索的下边界
+            $u = $this->totalIp; // 搜索的上边界
+            $findip = $this->lastIp; // 如果没有找到就返回最后一条IP记录（QQWry.Dat的版本信息）
             while ($l <= $u) {              // 当上边界小于下边界时，查找失败
-                $i = floor(($l + $u) / 2);  // 计算近似中间记录
-                fseek($this->fp, $this->firstIp + $i * 7);
-                $beginip = strrev(fread($this->fp, 4));     // 获取中间记录的开始IP地址
+                $i = floor(($l+$u)/2); // 计算近似中间记录
+                fseek($this->fp, $this->firstIp+$i*7);
+                $beginip = strrev(fread($this->fp, 4)); // 获取中间记录的开始IP地址
                 // strrev函数在这里的作用是将little-endian的压缩IP地址转化为big-endian的格式
                 // 以便用于比较，后面相同。
                 if ($ip < $beginip) {       // 用户的IP小于中间记录的开始IP地址时
-                    $u = $i - 1;            // 将搜索的上边界修改为中间记录减一
-                } else {
+                    $u = $i-1; // 将搜索的上边界修改为中间记录减一
+                }else {
                     fseek($this->fp, $this->getLong3());
-                    $endip = strrev(fread($this->fp, 4));   // 获取中间记录的结束IP地址
+                    $endip = strrev(fread($this->fp, 4)); // 获取中间记录的结束IP地址
                     if ($ip > $endip) {     // 用户的IP大于中间记录的结束IP地址时
-                        $l = $i + 1;        // 将搜索的下边界修改为中间记录加一
-                    } else {                  // 用户的IP在中间记录的IP范围内时
-                        $findip = $this->firstIp + $i * 7;
-                        break;              // 则表示找到结果，退出循环
+                        $l = $i+1; // 将搜索的下边界修改为中间记录加一
+                    }else {                  // 用户的IP在中间记录的IP范围内时
+                        $findip = $this->firstIp+$i*7;
+                        break; // 则表示找到结果，退出循环
                     }
                 }
             }
             //获取查找到的IP地理位置信息
             fseek($this->fp, $findip);
-            $location['beginip'] = long2ip($this->getLong());   // 用户IP所在范围的开始地址
+            $location['beginip'] = long2ip($this->getLong()); // 用户IP所在范围的开始地址
             $offset = $this->getLong3();
             fseek($this->fp, $offset);
-            $location['endip'] = long2ip($this->getLong());     // 用户IP所在范围的结束地址
-            $byte = fread($this->fp, 1);    // 标志字节
+            $location['endip'] = long2ip($this->getLong()); // 用户IP所在范围的结束地址
+            $byte = fread($this->fp, 1); // 标志字节
             switch (ord($byte)) {
                 case 1:                     // 标志字节为1，表示国家和区域信息都被同时重定向
-                    $countryOffset = $this->getLong3();         // 重定向地址
+                    $countryOffset = $this->getLong3(); // 重定向地址
                     fseek($this->fp, $countryOffset);
-                    $byte = fread($this->fp, 1);    // 标志字节
+                    $byte = fread($this->fp, 1); // 标志字节
                     switch (ord($byte)) {
                         case 2:             // 标志字节为2，表示国家信息又被重定向
                             fseek($this->fp, $this->getLong3());
                             $location['all'] = $this->getString();
-                            fseek($this->fp, $countryOffset + 4);
+                            fseek($this->fp, $countryOffset+4);
                             $location['extend'] = $this->getExtendString();
                             break;
                         default:            // 否则，表示国家信息没有被重定向
@@ -217,7 +217,7 @@ 
                 case 2:                     // 标志字节为2，表示国家信息被重定向
                     fseek($this->fp, $this->getLong3());
                     $location['all'] = $this->getString();
-                    fseek($this->fp, $offset + 8);
+                    fseek($this->fp, $offset+8);
                     $location['extend'] = $this->getExtendString();
                     break;
                 default:                    // 否则，表示国家信息没有被重定向
@@ -275,14 +275,14 @@ 
             if (count($preg) == 4) {        //匹配 "浙江省杭州市"
                 $state = $preg[1] ? $preg[1] : ($preg[2] ? $preg[2] : $preg[3]);
                 $city = $preg[3];
-            } else if (count($preg) == 7) { //匹配 "浙江省杭州市江干区"
+            }else if (count($preg) == 7) { //匹配 "浙江省杭州市江干区"
                 $state = $preg[1] ? $preg[1] : ($preg[2] ? $preg[2] : $preg[3]);
                 $city = $preg[3];
                 $area = $preg[5];
-            } else if (count($preg) == 3) { //匹配 "香港"
+            }else if (count($preg) == 3) { //匹配 "香港"
                 $state = $preg[1] ? $preg[1] : $preg[2];
                 $city = $state;
-            } else if (count($preg) == 2) {  //匹配 "浙江省"
+            }else if (count($preg) == 2) {  //匹配 "浙江省"
                 $state = $preg[1] ? $preg[1] : $this->unknown;
             }
         }
@@ -307,7 +307,7 @@ 
     private function getLong3()
     {
         //将读取的little-endian编码的3个字节转化为长整型数
-        $result = unpack('Vlong', fread($this->fp, 3) . chr(0));
+        $result = unpack('Vlong', fread($this->fp, 3).chr(0));
         return $result['long'];
     }
 
@@ -334,7 +334,7 @@ 
     {
         $char = fread($this->fp, 1);
         while (ord($char) > 0) {        // 字符串按照C格式保存，以\0结束
-            $data .= $char;             // 将读取的字符连接到给定字符串之后
+            $data .= $char; // 将读取的字符连接到给定字符串之后
             $char = fread($this->fp, 1);
         }
         return $data;
@@ -346,7 +346,7 @@ 
      */
     private function getExtendString()
     {
-        $byte = fread($this->fp, 1);    // 标志字节
+        $byte = fread($this->fp, 1); // 标志字节
         switch (ord($byte)) {
             case 0:                     // 没有区域信息
                 $area = "";
@@ -393,7 +393,7 @@ 
                 }
                 $IPParts[$i] = str_pad(decHex($IPPart), 2, '0', STR_PAD_LEFT);
             }
-            return '0000:0000:0000:0000:0000:ffff:' . $IPParts[1] . $IPParts[2] . ':' . $IPParts[3] . $IPParts[4];
+            return '0000:0000:0000:0000:0000:ffff:'.$IPParts[1].$IPParts[2].':'.$IPParts[3].$IPParts[4];
         }
         return '';
     }
@@ -425,7 +425,7 @@ 
         $district['lng'] = '';
 
         if (!empty($province_name)) {
-            $json_province = json_decode(file_get_contents($this->ipPath . 'province.json'), true);
+            $json_province = json_decode(file_get_contents($this->ipPath.'province.json'), true);
             foreach ($json_province['rows'] as $key => $value) {
                 if ($value['name'] == $province_name) {
                     $province['name'] = $value['name'];
@@ -436,7 +436,7 @@ 
             }
         }
         if (!empty($city_name)) {
-            $json_city = json_decode(file_get_contents($this->ipPath . 'city.json'), true);
+            $json_city = json_decode(file_get_contents($this->ipPath.'city.json'), true);
             foreach ($json_city['rows'] as $key => $value) {
                 if ($value['name'] == $city_name) {
                     $city['name'] = $value['name'];
@@ -447,7 +447,7 @@ 
             }
         }
         if (!empty($district_name)) {
-            $json_district = json_decode(file_get_contents($this->ipPath . 'district.json'), true);
+            $json_district = json_decode(file_get_contents($this->ipPath.'district.json'), true);
             foreach ($json_district['rows'] as $key => $value) {
                 if ($value['name'] == $district_name) {
                     $district['name'] = $value['name'];

src/service/curl/BtService.php

Spacing +2 added lines, -2 removed lines

@@ -130,7 +130,7 @@ 
     private function http()
     {
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->panel . $this->url);
+        curl_setopt($ch, CURLOPT_URL, $this->panel.$this->url);
         curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
         curl_setopt($ch, CURLOPT_POST, 1);
         curl_setopt($ch, CURLOPT_POSTFIELDS, array_merge($this->getKeyData(), $this->data));
@@ -154,7 +154,7 @@ 
     {
         $time = time();
         return array(
-            'request_token' => md5($time . '' . md5($this->key)),
+            'request_token' => md5($time.''.md5($this->key)),
             'request_time' => $time
         );
     }

src/service/curl/HttpService.php

Spacing +12 added lines, -12 removed lines

@@ -54,7 +54,7 @@ 
     {
         if (is_array($str)) {
             $this->data = json_encode($str, JSON_UNESCAPED_UNICODE);
-        } else {
+        }else {
             $this->data = $str;
         }
         return $this;
@@ -150,13 +150,13 @@ 
         }
         if ($this->method === 'GET') {
             $this->httpGet();
-        } else if ($this->method === 'POST') {
+        }else if ($this->method === 'POST') {
             $this->httpPost();
-        } else if ($this->method === 'XML') {
+        }else if ($this->method === 'XML') {
             $this->httpXml();
-        } else if ($this->method === 'FILE') {
+        }else if ($this->method === 'FILE') {
             $this->httpFile();
-        } else {
+        }else {
             throw new HttpException(404, '请求方式异常');
         }
         if (empty($is)) {
@@ -198,12 +198,12 @@ 
     {
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $this->url);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: ' . $this->headers));
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: '.$this->headers));
         curl_setopt($ch, CURLOPT_HEADER, 0);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // 跳过证书检查
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);  // 从证书中检查SSL加密算法是否存在
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); // 从证书中检查SSL加密算法是否存在
         curl_setopt($ch, CURLOPT_POST, 1);
         curl_setopt($ch, CURLOPT_POSTFIELDS, $this->data);
         curl_setopt($ch, CURLOPT_TIMEOUT, 10);
@@ -239,7 +239,7 @@ 
         curl_setopt($ch, CURLOPT_TIMEOUT, 40);
         set_time_limit(0);
         if (!empty($this->headers)) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: ' . $this->headers));
+            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: '.$this->headers));
         }
         //运行curl
         $data = curl_exec($ch);
@@ -266,19 +266,19 @@ 
             curl_setopt($ch, CURLOPT_SSLKEYTYPE, 'PEM');
             curl_setopt($ch, CURLOPT_SSLCERT, $this->cert['cert']);
             curl_setopt($ch, CURLOPT_SSLKEY, $this->cert['key']);
-        } else {
+        }else {
             if (substr($this->url, 0, 5) == 'https') {
                 curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // 信任任何证书
                 curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); // 检查证书中是否设置域名
             }
         }
         if (!empty($this->headers)) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, array('content-type: ' . $this->headers));
+            curl_setopt($ch, CURLOPT_HTTPHEADER, array('content-type: '.$this->headers));
         }
-        curl_setopt($ch, CURLOPT_HEADER, true);    // 是否需要响应 header
+        curl_setopt($ch, CURLOPT_HEADER, true); // 是否需要响应 header
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         $output = curl_exec($ch);
-        $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);    // 获得响应结果里的：头大小
+        $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE); // 获得响应结果里的：头大小
         $response_body = substr($output, $header_size);
         curl_close($ch);
         $this->output = $response_body;

src/cache/Mysql.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
         $result = Db::table($this->table)
             ->where('cache_name', $this->cache_name)
             ->update([
-                'cache_value' => $cache_value + $int
+                'cache_value' => $cache_value+$int
             ]);
         return $result ? true : false;
     }
@@ -153,7 +153,7 @@ 
         $result = Db::table($this->table)
             ->where('cache_name', $this->cache_name)
             ->update([
-                'cache_value' => $cache_value - $int
+                'cache_value' => $cache_value-$int
             ]);
         return $result ? true : false;
     }

src/helper/Decimals.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\helper;
 

src/helper/Pregs.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\helper;
 

src/facade/Strings.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\facade;
 

src/facade/Ints.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\facade;
 

src/facade/Decimals.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\facade;