majiameng / tools

src/UniqueId.php

Spacing +46 added lines, -46 removed lines

@@ -34,7 +34,7 @@ 
  *
  * php -r 'echo dechex( 0b00111111 );'
  */
-class UniqueId{
+class UniqueId {
 
 
     protected static $g_cInstanceDId;
@@ -50,12 +50,12 @@ 
     /**
      * __construct
      */
-    public function __construct(){}
+    public function __construct() {}
 
     /**
      * __destruct
      */
-    public function __destruct(){}
+    public function __destruct() {}
 
     /**
      * getInstance
@@ -63,7 +63,7 @@ 
      */
     static function getInstance()
     {
-        if ( is_null( self::$g_cInstanceDId ) || ! isset( self::$g_cInstanceDId ) )
+        if (is_null(self::$g_cInstanceDId) || !isset(self::$g_cInstanceDId))
         {
             self::$g_cInstanceDId = new self();
         }
@@ -80,42 +80,42 @@ 
      *	@param $arrData &array	details about the id
      *	@return int(64)	id
      */
-    public function createId( $nCenter, $nNode, $sSource = null, & $arrData = null )
+    public function createId($nCenter, $nNode, $sSource = null, & $arrData = null)
     {
-        if ( ! $this->isValidCenterId( $nCenter ) )
+        if (!$this->isValidCenterId($nCenter))
         {
             return null;
         }
-        if ( ! $this->isValidNodeId( $nNode ) )
+        if (!$this->isValidNodeId($nNode))
         {
             return null;
         }
 
         //	...
-        $nRet	= 0;
-        $nTime	= $this->getEscapedTime();
+        $nRet = 0;
+        $nTime = $this->getEscapedTime();
 
-        if ( is_string( $sSource ) && strlen( $sSource ) > 0 )
+        if (is_string($sSource) && strlen($sSource) > 0)
         {
             //	use crc32 hash value instead of rand
-            $nRand	= crc32( $sSource );
+            $nRand = crc32($sSource);
         }
         else
         {
             //	0 ~ 4095
-            $nRand	= rand( 0, 0xFFF );
+            $nRand = rand(0, 0xFFF);
         }
 
         //	...
-        $nCenterV	= ( ( $nCenter << 17 ) & 0x00000000003E0000 );
-        $nNodeV		= ( ( $nNode   << 12 ) & 0x000000000001F000 );
-        $nTimeV		= ( ( $nTime   << 22 ) & 0x7FFFFFFFFFC00000 );
-        $nRandV		= ( ( $nRand   << 0  ) & 0x0000000000000FFF );
+        $nCenterV = (($nCenter << 17) & 0x00000000003E0000);
+        $nNodeV		= (($nNode << 12) & 0x000000000001F000);
+        $nTimeV		= (($nTime << 22) & 0x7FFFFFFFFFC00000);
+        $nRandV		= (($nRand << 0) & 0x0000000000000FFF);
 
-        $nRet		= ( $nCenterV + $nNodeV + $nTimeV + $nRandV );
+        $nRet = ($nCenterV + $nNodeV + $nTimeV + $nRandV);
 
         //	...
-        if ( ! is_null( $arrData ) )
+        if (!is_null($arrData))
         {
             $arrData =
                 [
@@ -126,7 +126,7 @@ 
                 ];
         }
 
-        return intval( $nRet );
+        return intval($nRet);
     }
 
     /**
@@ -135,18 +135,18 @@ 
      *	@param $nId int		64 bits unique id
      *	@return array		details about the id
      */
-    public function parseId( $nId )
+    public function parseId($nId)
     {
-        if ( ! is_numeric( $nId ) || $nId <= 0 )
+        if (!is_numeric($nId) || $nId <= 0)
         {
             return null;
         }
 
         //	...
-        $nCenter	= ( ( $nId & 0x00000000003E0000 ) >> 17 );
-        $nNode		= ( ( $nId & 0x000000000001F000 ) >> 12 );
-        $nTime		= ( ( $nId & 0x7FFFFFFFFFC00000 ) >> 22 );
-        $nRand		= ( ( $nId & 0x0000000000000FFF ) >> 0  );
+        $nCenter = (($nId & 0x00000000003E0000) >> 17);
+        $nNode		= (($nId & 0x000000000001F000) >> 12);
+        $nTime		= (($nId & 0x7FFFFFFFFFC00000) >> 22);
+        $nRand		= (($nId & 0x0000000000000FFF) >> 0);
 
         return
             [
@@ -163,20 +163,20 @@ 
      *	@param $nVal int	64 bits unique id
      *	@return boolean		true or false
      */
-    public function isValidId( $nVal )
+    public function isValidId($nVal)
     {
         $bRet	= false;
-        $arrD	= $this->parseId( $nVal );
-        if ( is_array( $arrD ) &&
-            array_key_exists( 'center', $arrD ) &&
-            array_key_exists( 'node', $arrD ) &&
-            array_key_exists( 'time', $arrD ) &&
-            array_key_exists( 'rand', $arrD ) )
+        $arrD	= $this->parseId($nVal);
+        if (is_array($arrD) &&
+            array_key_exists('center', $arrD) &&
+            array_key_exists('node', $arrD) &&
+            array_key_exists('time', $arrD) &&
+            array_key_exists('rand', $arrD))
         {
-            if ( $this->isValidCenterId( $arrD[ 'center' ] ) &&
-                $this->isValidNodeId( $arrD[ 'node' ] ) &&
-                $this->isValidTime( $arrD[ 'time' ] ) &&
-                $this->isValidRand( $arrD[ 'rand' ] ) )
+            if ($this->isValidCenterId($arrD['center']) &&
+                $this->isValidNodeId($arrD['node']) &&
+                $this->isValidTime($arrD['time']) &&
+                $this->isValidRand($arrD['rand']))
             {
                 $bRet = true;
             }
@@ -190,36 +190,36 @@ 
      * @param $nVal
      * @return bool
      */
-    public function isValidCenterId( $nVal )
+    public function isValidCenterId($nVal)
     {
-        return is_numeric( $nVal ) && ( $nVal >= 0 ) && ( $nVal <= 31 );
+        return is_numeric($nVal) && ($nVal >= 0) && ($nVal <= 31);
     }
 
     /**
      * @param $nVal
      * @return bool
      */
-    public function isValidNodeId( $nVal )
+    public function isValidNodeId($nVal)
     {
-        return is_numeric( $nVal ) && ( $nVal >= 0 ) && ( $nVal <= 31 );
+        return is_numeric($nVal) && ($nVal >= 0) && ($nVal <= 31);
     }
 
     /**
      * @param $nVal
      * @return bool
      */
-    public function isValidTime( $nVal )
+    public function isValidTime($nVal)
     {
-        return is_numeric( $nVal ) && ( $nVal >= 0 );
+        return is_numeric($nVal) && ($nVal >= 0);
     }
 
     /**
      * @param $nVal
      * @return bool
      */
-    public function isValidRand( $nVal )
+    public function isValidRand($nVal)
     {
-        return is_numeric( $nVal ) && ( $nVal >= 0 ) && ( $nVal <= 0xFFF );
+        return is_numeric($nVal) && ($nVal >= 0) && ($nVal <= 0xFFF);
     }
 
 
@@ -230,7 +230,7 @@ 
      */
     public function getUnixTimestamp()
     {
-        return floor( microtime( true ) * 1000 );
+        return floor(microtime(true) * 1000);
     }
 
     /**
@@ -240,6 +240,6 @@ 
      */
     public function getEscapedTime()
     {
-        return intval( $this->getUnixTimestamp() - self::EPOCH_OFFSET );
+        return intval($this->getUnixTimestamp() - self::EPOCH_OFFSET);
     }
 }

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
         {
             //	use crc32 hash value instead of rand
             $nRand	= crc32( $sSource );
-        }
-        else
+        } else
         {
             //	0 ~ 4095
             $nRand	= rand( 0, 0xFFF );

src/UrlTool.php

Spacing +9 added lines, -9 removed lines

@@ -3,7 +3,7 @@ 
 /**
  * Url
  */
-class UrlTool{
+class UrlTool {
 
     /**
      * 获取url中主域名
@@ -11,16 +11,16 @@ 
      * @return string
      */
     static public function getMainDomain($url) {
-        $url = strtolower($url);//首先转成小写
+        $url = strtolower($url); //首先转成小写
         $host = parse_url($url, PHP_URL_HOST); // 获取host部分
-        if(empty($host)){
+        if (empty($host)) {
             $url = "https://".$url;
-            $host = parse_url($url,PHP_URL_HOST);
+            $host = parse_url($url, PHP_URL_HOST);
         }
         if (!$host) {
             return '';
         }
-        if (in_array($host,['127.0.0.1','localhost'])) {
+        if (in_array($host, ['127.0.0.1', 'localhost'])) {
             return '';
         }
 
@@ -34,12 +34,12 @@ 
          *  判断是否是双后缀aaa.com.cn
          */
         $preg = '/[\w].+\.(com|net|org|gov|edu)\.cn$/';
-        if ($count > 2 && preg_match($preg,$host)){
+        if ($count > 2 && preg_match($preg, $host)) {
             //双后缀取后3位
-            $host = $parts[$count-3].'.'.$parts[$count-2].'.'.$parts[$count-1];
-        } else{
+            $host = $parts[$count - 3].'.'.$parts[$count - 2].'.'.$parts[$count - 1];
+        } else {
             // 如果只有两个部分，则直接返回整个host作为主域名
-            $host = $parts[$count-2].'.'.$parts[$count-1];
+            $host = $parts[$count - 2].'.'.$parts[$count - 1];
         }
         return $host;
     }

src/async/AsyncHook.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace tinymeng\tools\async;
 
-class AsyncHook{
+class AsyncHook {
 
     /**
      * @var array
@@ -20,7 +20,7 @@ 
      */
     public static function hook(callable $callback, $params) {
         self::$hook_list[] = array('callback' => $callback, 'params' => $params);
-        if(self::$hooked === false) {
+        if (self::$hooked === false) {
             self::$hooked = true;
             //注册一个callback当前在脚本执行完后执行
             register_shutdown_function(array(__CLASS__, '__run'));
@@ -33,10 +33,10 @@ 
      */
     private static function __run() {
         fastcgi_finish_request();
-        if(empty(self::$hook_list)) {
+        if (empty(self::$hook_list)) {
             return;
         }
-        foreach(self::$hook_list as $hook) {
+        foreach (self::$hook_list as $hook) {
             $callback = $hook['callback'];
             $params = $hook['params'];
             call_user_func_array($callback, $params);

src/core/Singleton.php

Spacing +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@ 
      */
     private static $instance = null;
 
-    public function __construct($config=[]){
+    public function __construct($config = []) {
         $this->config = $config;
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     public function __sleep(): array
     {
@@ -25,7 +25,7 @@ 
         return [];
     }
 
-    protected static function init($gateway, $config=[])
+    protected static function init($gateway, $config = [])
     {
         if (!self::$instance instanceof static) {
             self::$instance = new static($config);
@@ -41,7 +41,7 @@ 
      *@author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    public static function __callStatic($gateway, array $config=[])
+    public static function __callStatic($gateway, array $config = [])
     {
         return self::init($gateway, ...$config);
     }

src/exception/TException.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $this->setHeaders($headers);
 
         /** message */
-        if(empty($message)) $message = StatusCode::$status_code[$statusCode] ?? StatusCode::$status_code[StatusCode::COMMON_UNKNOWN];
+        if (empty($message)) $message = StatusCode::$status_code[$statusCode] ?? StatusCode::$status_code[StatusCode::COMMON_UNKNOWN];
         parent::__construct('ERROR tinymeng tools: '.$message, $code, $previous);
     }
 

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
         $this->setHeaders($headers);
 
         /** message */
-        if(empty($message)) $message = StatusCode::$status_code[$statusCode] ?? StatusCode::$status_code[StatusCode::COMMON_UNKNOWN];
+        if(empty($message)) {
+            $message = StatusCode::$status_code[$statusCode] ?? StatusCode::$status_code[StatusCode::COMMON_UNKNOWN];
+        }
         parent::__construct('ERROR tinymeng tools: '.$message, $code, $previous);
     }
 

src/HttpRequest.php

Spacing +25 added lines, -25 removed lines

@@ -37,19 +37,19 @@ 
      * @return bool|string
      * @throws \Exception
      */
-    static public function httpPost(string $url, array $param = array(), array $httpHeaders = array(), string $proxy='', int $http_code = 200)
+    static public function httpPost(string $url, array $param = array(), array $httpHeaders = array(), string $proxy = '', int $http_code = 200)
     {
         /** 参数检测,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){
+            if ($flag) {
                 $param = http_build_query($param);
             }
         }
@@ -66,7 +66,7 @@ 
         curl_setopt($curl, CURLOPT_POSTFIELDS, $param);
 
         /** 设置请求headers */
-        if(empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
+        if (empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
         curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
 
         /** gzip压缩 */
@@ -80,11 +80,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]); //代理服务器端口
         }
 
         /** 请求 */
@@ -94,20 +94,20 @@ 
         /** 关闭请求资源 */
         curl_close($curl);
 
-        if($http_code !== 0){
+        if ($http_code !== 0) {
             /** 验证网络请求状态 */
             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;
         }
     }
@@ -124,13 +124,13 @@ 
      * @return bool|string
      * @throws \Exception
      */
-    static public function httpGet(string $url, array $param = array(), array $httpHeaders = array(), string $proxy= '', int $http_code = 200)
+    static public function httpGet(string $url, array $param = array(), array $httpHeaders = array(), string $proxy = '', int $http_code = 200)
     {
         $curl = curl_init();
 
         /** 设置请求参数 */
         if (!empty($param)) {
-            $url = $url . '?' . http_build_query($param);
+            $url = $url.'?'.http_build_query($param);
         }
 
         /** 设置请求链接 */
@@ -146,15 +146,15 @@ 
         }
 
         /** 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)) $httpHeaders = self::$httpHeaders;
+        if (empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
         curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
 
         /** gzip压缩 */
@@ -168,19 +168,19 @@ 
         curl_close($curl);
 
         /** 验证网络请求状态 */
-        if($http_code !== 0){
+        if ($http_code !== 0) {
             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 +10 added lines, -6 removed lines

@@ -66,7 +66,9 @@ 
         curl_setopt($curl, CURLOPT_POSTFIELDS, $param);
 
         /** 设置请求headers */
-        if(empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
+        if(empty($httpHeaders)) {
+            $httpHeaders = self::$httpHeaders;
+        }
         curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
 
         /** gzip压缩 */
@@ -100,14 +102,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;
         }
     }
@@ -154,7 +156,9 @@ 
         }
 
         /** 设置请求headers */
-        if(empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
+        if(empty($httpHeaders)) {
+            $httpHeaders = self::$httpHeaders;
+        }
         curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
 
         /** gzip压缩 */
@@ -173,14 +177,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;
         }
     }