GC0202 / ThinkLibrary

src/helper/Urls.php

Spacing +2 added lines, -2 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;
 
@@ -64,7 +64,7 @@ 
         $buff = "";
         foreach ($data as $k => $v) {
             if ($k !== "sign" && $v !== "" && !is_array($v)) {
-                $buff .= $k . "=" . $v . "&";
+                $buff .= $k."=".$v."&";
             }
         }
         $buff = trim($buff, "&");

src/helper/Files.php

Spacing +7 added lines, -7 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;
 
@@ -67,10 +67,10 @@ 
         $dh = opendir($name);
         while ($file = readdir($dh)) {
             if ($file !== "." && $file !== "..") {
-                $fullpath = $name . "/" . $file;
+                $fullpath = $name."/".$file;
                 if (!is_dir($fullpath)) {
                     unlink($fullpath);
-                } else {
+                }else {
                     $this->deletes($fullpath);
                 }
             }
@@ -97,7 +97,7 @@ 
         if (empty($name)) {
             throw new DtaException('请检查需要打包的路径名称');
         }
-        $list = glob($name . "{$file_name}.{$suffix_name}");
+        $list = glob($name."{$file_name}.{$suffix_name}");
         $fileList = $list;
         $zip = new ZipArchive();
         // 打开压缩包
@@ -120,13 +120,13 @@ 
     {
         $files = [];
         if (is_dir($path)) {
-            $path = dirname($path) . '/' . basename($path) . '/';
+            $path = dirname($path).'/'.basename($path).'/';
             $file = dir($path);
             while (false !== ($entry = $file->read())) {
                 if ($entry !== '.' && $entry !== '..') {
-                    $cur = $path . $entry;
+                    $cur = $path.$entry;
                     if (is_dir($cur)) {
-                        $subPath = $cur . '/';
+                        $subPath = $cur.'/';
                         $this->getFiles($subPath);
                     }
                     $files[] = $cur;

src/helper/Randoms.php

Spacing +3 added lines, -3 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;
 
@@ -58,13 +58,13 @@ 
             $charset = array_merge($lowerLetter, $upperLetter);
         } elseif ($type === 7) {
             $charset = array_merge($number, $lowerLetter, $upperLetter);
-        } else {
+        }else {
             $charset = $number;
         }
         $str = '';
         // 生成字符串
         for ($i = 0; $i < $length; $i++) {
-            $str .= $charset[random_int(0, count($charset) - 1)];
+            $str .= $charset[random_int(0, count($charset)-1)];
             // 验证规则
             if ($type === 4 && strlen($str) >= 2) {
                 if (!preg_match('/\d+/', $str) || !preg_match('/[a-z]+/', $str)) {

src/service/tencent/LbsService.php

Spacing +2 added lines, -2 removed lines

@@ -243,7 +243,7 @@ 
     {
         //组织参数
         $strParam = $this->createStrParam();
-        $result = file_get_contents($this->api_url . "?{$strParam}");
+        $result = file_get_contents($this->api_url."?{$strParam}");
         $result = json_decode($result, true);
         $this->output = $result;
     }
@@ -257,7 +257,7 @@ 
         $strParam = '';
         foreach ($this->param as $key => $val) {
             if ($key !== '' && $val !== '') {
-                $strParam .= $key . '=' . urlencode($val) . '&';
+                $strParam .= $key.'='.urlencode($val).'&';
             }
         }
         return $strParam;

src/service/decent/EJiAoFei.php

Spacing +2 added lines, -2 removed lines

@@ -210,8 +210,8 @@
         //生成签名
         $sign = $this->createSign();
         //组织参数
-        $this->param .= '&userkey=' . $sign;
-        $url = "http://" . $this->api . "/" . $this->method . ".do?{$this->param}";
+        $this->param .= '&userkey='.$sign;
+        $url = "http://".$this->api."/".$this->method.".do?{$this->param}";
         $result = file_get_contents($url);
         $result = Xmls::toArray($result);
         $this->output = $result;

src/service/qiniu/SmsService.php

Spacing +5 added lines, -5 removed lines

@@ -311,7 +311,7 @@ 
     {
         if (is_object($object)) {
             $arr = (array)($object);
-        } else {
+        }else {
             $arr = &$object;
         }
         if (is_array($arr)) {
@@ -345,8 +345,8 @@ 
         $recToken = $auth->authorizationV2($this->url, $this->method, json_encode($this->param), $this->contentType);
         $rtcToken['Content-Type'] = $this->contentType;
         dump($recToken);
-        dump($this->url . "?" . http_build_query($this->param));
-        $ret = Client::get($this->url . "?" . http_build_query($this->param), $recToken);
+        dump($this->url."?".http_build_query($this->param));
+        $ret = Client::get($this->url."?".http_build_query($this->param), $recToken);
         dump($ret);
         $this->output = $ret->json();
         return $this;
@@ -362,7 +362,7 @@ 
         $url = parse_url($this->url);
         $data = $url['path'] ?? '';
         if (isset($url['query'])) {
-            $data .= '?' . $url['query'];
+            $data .= '?'.$url['query'];
         }
         $data .= "\n";
         if (isset($this->param) && $this->contentType === 'application/x-www-form-urlencoded') {
@@ -378,7 +378,7 @@ 
     private function sign($data)
     {
         $sign = hash_hmac('sha1', $data, $this->secretKey, true);
-        return "Qiniu " . sprintf('%s:%s', $this->accessKey, $this->encode($sign));
+        return "Qiniu ".sprintf('%s:%s', $this->accessKey, $this->encode($sign));
     }
 
     /**

src/service/ExcelService.php

Spacing +2 added lines, -2 removed lines

@@ -167,12 +167,12 @@
         //设置单元格内容
         foreach ($this->head as $key => $value) {
             foreach ($value as $k => $v) {
-                $sheet->setCellValueByColumnAndRow($v['index'], $key + 1, $v['value']);
+                $sheet->setCellValueByColumnAndRow($v['index'], $key+1, $v['value']);
             }
         }
         foreach ($this->content as $key => $value) {
             foreach ($value as $k => $v) {
-                $sheet->setCellValueByColumnAndRow($v['index'], $key + $this->head_length, $v['value']);
+                $sheet->setCellValueByColumnAndRow($v['index'], $key+$this->head_length, $v['value']);
             }
         }
         $writer = new Xlsx($spreadsheet);

src/service/QqWryService.php

Spacing +34 added lines, -34 removed lines

@@ -68,10 +68,10 @@ 
     public function __construct(App $app)
     {
         $this->fp = 0;
-        if (($this->fp = fopen(__DIR__ . '/bin/qqwry.dat', 'rb')) !== false) {
+        if (($this->fp = fopen(__DIR__.'/bin/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);
     }
@@ -152,49 +152,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:            // 否则，表示国家信息没有被重定向
@@ -206,7 +206,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:                    // 否则，表示国家信息没有被重定向
@@ -264,14 +264,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;
             }
         }
@@ -296,7 +296,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'];
     }
 
@@ -323,7 +323,7 @@ 
     {
         $char = fread($this->fp, 1);
         while (ord($char) > 0) {        // 字符串按照C格式保存，以\0结束
-            $data .= $char;             // 将读取的字符连接到给定字符串之后
+            $data .= $char; // 将读取的字符连接到给定字符串之后
             $char = fread($this->fp, 1);
         }
         return $data;
@@ -335,7 +335,7 @@ 
      */
     private function getExtendString()
     {
-        $byte = fread($this->fp, 1);    // 标志字节
+        $byte = fread($this->fp, 1); // 标志字节
         switch (ord($byte)) {
             case 0:                     // 没有区域信息
                 $area = "";
@@ -382,7 +382,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 '';
     }
@@ -414,7 +414,7 @@ 
         $district['lng'] = '';
 
         if (!empty($province_name)) {
-            $json_province = json_decode(file_get_contents(__DIR__ . '/bin/province.json'), true);
+            $json_province = json_decode(file_get_contents(__DIR__.'/bin/province.json'), true);
             foreach ($json_province['rows'] as $key => $value) {
                 if ($value['name'] == $province_name) {
                     $province['name'] = $value['name'];
@@ -425,7 +425,7 @@ 
             }
         }
         if (!empty($city_name)) {
-            $json_city = json_decode(file_get_contents(__DIR__ . '/bin/city.json'), true);
+            $json_city = json_decode(file_get_contents(__DIR__.'/bin/city.json'), true);
             foreach ($json_city['rows'] as $key => $value) {
                 if ($value['name'] == $city_name) {
                     $city['name'] = $value['name'];
@@ -436,7 +436,7 @@ 
             }
         }
         if (!empty($district_name)) {
-            $json_district = json_decode(file_get_contents(__DIR__ . '/bin/district.json'), true);
+            $json_district = json_decode(file_get_contents(__DIR__.'/bin/district.json'), true);
             foreach ($json_district['rows'] as $key => $value) {
                 if ($value['name'] == $district_name) {
                     $district['name'] = $value['name'];

src/service/Ip/IpIpService.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function __construct(App $app)
     {
-        $this->reader = new IpIpReader(__DIR__ . '../bin/ipipfree.ipdb');
+        $this->reader = new IpIpReader(__DIR__.'../bin/ipipfree.ipdb');
         parent::__construct($app);
     }