Rozbo / puck

function.php

Braces +2 added lines, -4 removed lines

@@ -40,8 +40,7 @@ 
 
     if (isset($arr['status']) && $type == 2) {
         $ret=$arr;
-    }
-    else {
+    } else {
         $ret['status']=$type;
         $ret['data']=$arr;
     }
@@ -323,8 +322,7 @@ 
         if ($filters) {
             if (is_string($filters)) {
                 $filters=explode(',', $filters);
-            }
-            else if (is_array($filters)) {
+            } else if (is_array($filters)) {
                 foreach ($filters as $filter) {
                     $data=array_map_recursive($filter, $data); // 参数过滤
                 }

Doc Comments +2 added lines, -2 removed lines

@@ -462,8 +462,8 @@
      * 获取环境变量
      *
      * @param  string  $key
-     * @param  mixed   $default
-     * @return mixed
+     * @param  string|false   $default
+     * @return string
      */
     function env($key, $default = null)
     {

Spacing +11 added lines, -11 removed lines

@@ -408,7 +408,7 @@ 
 
     // 过滤查询特殊字符
     if (preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN)$/i', $value)) {
-        $value .= ' ';
+        $value.=' ';
     }
 }
 /**
@@ -416,15 +416,15 @@ 
  *
  * @return string|null
  */
-function config($name=null,$value=null,$default=null){
+function config($name=null, $value=null, $default=null) {
     $config=\puck\Conf::load();
-    if ($name===null){
+    if ($name === null) {
         return $config->all();
     }
-    if ($value===null){
-        return $config->get($name,$default);
+    if ($value === null) {
+        return $config->get($name, $default);
     }
-    $config->set($name,$value);
+    $config->set($name, $value);
 }
 /**
  * 字符串命名风格转换
@@ -441,14 +441,14 @@ 
     }
 }
 
-if (! function_exists('app')) {
+if (!function_exists('app')) {
     /**
      * 获取容器实例
      *
      * @param  string  $make
      * @return mixed|\puck\App
      */
-    function app($make = null)
+    function app($make=null)
     {
         if (is_null($make)) {
             return Container::getInstance();
@@ -457,7 +457,7 @@ 
     }
 }
 
-if (! function_exists('env')) {
+if (!function_exists('env')) {
     /**
      * 获取环境变量
      *
@@ -465,9 +465,9 @@ 
      * @param  mixed   $default
      * @return mixed
      */
-    function env($key, $default = null)
+    function env($key, $default=null)
     {
-        $value = getenv($key);
+        $value=getenv($key);
         if ($value === false) {
             return value($default);
         }

core/helpers/Chaos.php

Indentation +159 added lines, -159 removed lines

@@ -1,199 +1,199 @@
 <?php
 namespace puck\helpers;
 class Chaos {
-	public $GbToBigArray;
-	public $_pinyin;
-	public $string;
-	public $url='';
-	public $msg='';
-	public $action;
-	private $prefix;
+    public $GbToBigArray;
+    public $_pinyin;
+    public $string;
+    public $url='';
+    public $msg='';
+    public $action;
+    private $prefix;
 	
     function __construct() {
-		$this->_pinyin=new PinYin();
-	}
+        $this->_pinyin=new PinYin();
+    }
 
     /**
      * @param array $prefix
      */
     public function addPrefix(array $prefix) {
         $this->prefix=$prefix[array_rand($prefix)];
-	}
+    }
 
     public function clearPrefix() {
         $this->prefix='';
-	}
+    }
     public function get($str) {
         $this->cutting($str);
         $this->convert();
         $this->clearPrefix();
         return $this->msg;
-	}
+    }
 
-	//分离URL
-	private function cutting($str) {
+    //分离URL
+    private function cutting($str) {
 
-		if (preg_match("@(http://[^\\s]+)@i", $str, $result)) {
-			$this->url=$result[1];
-			$this->msg=$str=str_replace($this->url, '%%%%', $str);
-		} else {
-			$this->msg=$str;
-		}
-	}
+        if (preg_match("@(http://[^\\s]+)@i", $str, $result)) {
+            $this->url=$result[1];
+            $this->msg=$str=str_replace($this->url, '%%%%', $str);
+        } else {
+            $this->msg=$str;
+        }
+    }
 	
 	
 	
-	private function convert($method='msg') {
-		if ($method == 'msg' || $method == 'all') {
-			$this->msg=$this->setPinyin($this->msg);
-			$this->msg=$this->setRepeat($this->msg);
-			//$this->msg = $this->GbToBig($this->msg);
-			$this->msg=$this->setBlankness($this->msg);
+    private function convert($method='msg') {
+        if ($method == 'msg' || $method == 'all') {
+            $this->msg=$this->setPinyin($this->msg);
+            $this->msg=$this->setRepeat($this->msg);
+            //$this->msg = $this->GbToBig($this->msg);
+            $this->msg=$this->setBlankness($this->msg);
 			
-		}
-		if ($method == 'url' || $method == 'all') {
-			$this->url=$this->setChacha($this->url);
-		}
-		$this->msg=$this->prefix.str_replace('%%%%', $this->url, $this->msg);
-	}
+        }
+        if ($method == 'url' || $method == 'all') {
+            $this->url=$this->setChacha($this->url);
+        }
+        $this->msg=$this->prefix.str_replace('%%%%', $this->url, $this->msg);
+    }
 	
-	/**
-	 * @param string $url
-	 */
-	function setChacha($url) {
-		$url=strtolower($url);
-		$arr=array(
-			'a' => array('a', 'A', 'ａ', 'Ａ', 'Α', 'А', 'α'),
-			'b' => array('b', 'B', 'ｂ', 'Ｂ', 'Β', 'В', 'Ь'),
-			'c' => array('c', 'C', 'ｃ', 'Ｃ', 'С', 'с'),
-			'd' => array('d', 'D', 'ｄ', 'Ｄ'),
-			'e' => array('e', 'E', 'ｅ', 'Ｅ', 'Ε', 'Е', 'е'),
-			'f' => array('f', 'F', 'ｆ', 'Ｆ'),
-			'g' => array('g', 'G', 'ｇ', 'Ｇ'),
-			'h' => array('h', 'H', 'ｈ', 'Ｈ', 'Η', 'Н', 'н'),
-			'i' => array('i', 'I', 'ｉ', 'Ｉ', 'Ι', 'Ⅰ'),
-			'j' => array('j', 'J', 'ｊ', 'Ｊ'),
-			'k' => array('k', 'K', 'ｋ', 'Ｋ', 'Κ', 'κ', 'к', 'К'),
-			'l' => array('l', 'L', 'ｌ', 'Ｌ', '︱', '︳', '|'),
-			'm' => array('m', 'M', 'ｍ', 'Ｍ', 'Μ', 'М', 'м'),
-			'n' => array('n', 'N', 'ｎ', 'Ｎ', 'Ν', '∩'),
-			'o' => array('o', 'O', 'ｏ', 'Ｏ', 'Ο', 'О'),
-			'p' => array('p', 'P', 'ｐ', 'Ｐ', 'Ρ', 'Р', 'р'),
-			'q' => array('q', 'Q', 'ｑ', 'Ｑ'),
-			'r' => array('r', 'R', 'ｒ', 'Ｒ'),
-			's' => array('s', 'S', 'ｓ', 'Ｓ'),
-			't' => array('t', 'T', 'ｔ', 'Ｔ', 'Τ', 'Т', 'ㄒ'),
-			'u' => array('u', 'U', 'ｕ', 'Ｕ', '∪'),
-			'v' => array('v', 'V', 'ｖ', 'Ｖ', '∨', 'ν'),
-			'w' => array('w', 'W', 'ｗ', 'Ｗ'),
-			'x' => array('x', 'X', 'ｘ', 'Ｘ', 'Χ', 'χ', 'Х', 'х', 'Ⅹ', '×'),
-			'y' => array('y', 'Y', 'ｙ', 'Ｙ', 'У'),
-			'z' => array('z', 'Z', 'ｚ', 'Ｚ', 'Ζ'),
+    /**
+     * @param string $url
+     */
+    function setChacha($url) {
+        $url=strtolower($url);
+        $arr=array(
+            'a' => array('a', 'A', 'ａ', 'Ａ', 'Α', 'А', 'α'),
+            'b' => array('b', 'B', 'ｂ', 'Ｂ', 'Β', 'В', 'Ь'),
+            'c' => array('c', 'C', 'ｃ', 'Ｃ', 'С', 'с'),
+            'd' => array('d', 'D', 'ｄ', 'Ｄ'),
+            'e' => array('e', 'E', 'ｅ', 'Ｅ', 'Ε', 'Е', 'е'),
+            'f' => array('f', 'F', 'ｆ', 'Ｆ'),
+            'g' => array('g', 'G', 'ｇ', 'Ｇ'),
+            'h' => array('h', 'H', 'ｈ', 'Ｈ', 'Η', 'Н', 'н'),
+            'i' => array('i', 'I', 'ｉ', 'Ｉ', 'Ι', 'Ⅰ'),
+            'j' => array('j', 'J', 'ｊ', 'Ｊ'),
+            'k' => array('k', 'K', 'ｋ', 'Ｋ', 'Κ', 'κ', 'к', 'К'),
+            'l' => array('l', 'L', 'ｌ', 'Ｌ', '︱', '︳', '|'),
+            'm' => array('m', 'M', 'ｍ', 'Ｍ', 'Μ', 'М', 'м'),
+            'n' => array('n', 'N', 'ｎ', 'Ｎ', 'Ν', '∩'),
+            'o' => array('o', 'O', 'ｏ', 'Ｏ', 'Ο', 'О'),
+            'p' => array('p', 'P', 'ｐ', 'Ｐ', 'Ρ', 'Р', 'р'),
+            'q' => array('q', 'Q', 'ｑ', 'Ｑ'),
+            'r' => array('r', 'R', 'ｒ', 'Ｒ'),
+            's' => array('s', 'S', 'ｓ', 'Ｓ'),
+            't' => array('t', 'T', 'ｔ', 'Ｔ', 'Τ', 'Т', 'ㄒ'),
+            'u' => array('u', 'U', 'ｕ', 'Ｕ', '∪'),
+            'v' => array('v', 'V', 'ｖ', 'Ｖ', '∨', 'ν'),
+            'w' => array('w', 'W', 'ｗ', 'Ｗ'),
+            'x' => array('x', 'X', 'ｘ', 'Ｘ', 'Χ', 'χ', 'Х', 'х', 'Ⅹ', '×'),
+            'y' => array('y', 'Y', 'ｙ', 'Ｙ', 'У'),
+            'z' => array('z', 'Z', 'ｚ', 'Ｚ', 'Ζ'),
 			
-			'1' => array('1', '１'),
-			'2' => array('2', '２'),
-			'3' => array('3', '３'),
-			'4' => array('4', '４'),
-			'5' => array('5', '５'),
-			'6' => array('6', '６'),
-			'7' => array('7', '７'),
-			'8' => array('8', '８'),
-			'9' => array('9', '９'),
-			'0' => array('0', '０'),
+            '1' => array('1', '１'),
+            '2' => array('2', '２'),
+            '3' => array('3', '３'),
+            '4' => array('4', '４'),
+            '5' => array('5', '５'),
+            '6' => array('6', '６'),
+            '7' => array('7', '７'),
+            '8' => array('8', '８'),
+            '9' => array('9', '９'),
+            '0' => array('0', '０'),
 			
-			':' => array(':', '：', '∶'),
-			'/' => array('/', '／'),
-			'.' => array('。', '·', '．', '、', '﹒', '，', '丶')
+            ':' => array(':', '：', '∶'),
+            '/' => array('/', '／'),
+            '.' => array('。', '·', '．', '、', '﹒', '，', '丶')
 		
-		);
-		$len=strlen($url);
-		$temp="\n\n";
-		for ($i=0; $i < $len; $i++) {
-			$t_str=substr($url, $i, 1);
-			$sj=mt_rand(0, count($arr[$t_str]) - 1);
-			$temp.=$arr[$t_str][$sj];
-		}
-		return $temp;
-	}
+        );
+        $len=strlen($url);
+        $temp="\n\n";
+        for ($i=0; $i < $len; $i++) {
+            $t_str=substr($url, $i, 1);
+            $sj=mt_rand(0, count($arr[$t_str]) - 1);
+            $temp.=$arr[$t_str][$sj];
+        }
+        return $temp;
+    }
 
-	//随机把一个字符转为拼音
+    //随机把一个字符转为拼音
 
-	/**
-	 * @param string $str
-	 */
-	function setPinyin($str) {
-		$py = mt_rand(0, iconv_strlen( $str, 'UTF-8' )-1);
-		$t_str = iconv_substr( $str, $py, 1, 'UTF-8');
-		if(mt_rand(0,10) > 5) {
-		    $pinyin = " ";
-		}
-		$pinyin = $this->_pinyin->convert($t_str,PINYIN_UNICODE);
+    /**
+     * @param string $str
+     */
+    function setPinyin($str) {
+        $py = mt_rand(0, iconv_strlen( $str, 'UTF-8' )-1);
+        $t_str = iconv_substr( $str, $py, 1, 'UTF-8');
+        if(mt_rand(0,10) > 5) {
+            $pinyin = " ";
+        }
+        $pinyin = $this->_pinyin->convert($t_str,PINYIN_UNICODE);
         $pinyin=implode(" ",$pinyin);
-		if(mt_rand(0,10) > 5) {
-		    $pinyin .= " ";
-		}
-		if($t_str != "%"){
-			$str = preg_replace("'$t_str'", $pinyin, $str, 1);
-		}
-		return $str;
-	}
+        if(mt_rand(0,10) > 5) {
+            $pinyin .= " ";
+        }
+        if($t_str != "%"){
+            $str = preg_replace("'$t_str'", $pinyin, $str, 1);
+        }
+        return $str;
+    }
 	
-	//随机重复一个字符
+    //随机重复一个字符
 
-	/**
-	 * @param string $str
-	 */
-	function setRepeat($str) {
-		$len = iconv_strlen( $str, 'UTF-8' );
-		$action = 0;
-		$temp = '';
-		for( $i=0;  $i<$len; $i++ ){
-			$t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
-			if( mt_rand( 1, 50 ) > 48 && $action == 0) {
-				if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
-					$temp .= $t_str;
-					$action = 1;
-				}
-			}
-			$temp .= $t_str;
-		}
-		return $temp;
-	}
+    /**
+     * @param string $str
+     */
+    function setRepeat($str) {
+        $len = iconv_strlen( $str, 'UTF-8' );
+        $action = 0;
+        $temp = '';
+        for( $i=0;  $i<$len; $i++ ){
+            $t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
+            if( mt_rand( 1, 50 ) > 48 && $action == 0) {
+                if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
+                    $temp .= $t_str;
+                    $action = 1;
+                }
+            }
+            $temp .= $t_str;
+        }
+        return $temp;
+    }
 	
-	//随机插入不影响阅读的字符
+    //随机插入不影响阅读的字符
 
-	/**
-	 * @param string $str
-	 */
-	function setBlankness($str) {
-		$blankness=array(" ", '　', '҉', '̅̅', '̲', '̲̲', '̅', '̲̲̅̅');
-		$len=iconv_strlen($str, 'UTF-8');
-		$temp='';
-		for ($i=0; $i < $len; $i++) {
-			$t_str=iconv_substr($str, $i, 1, 'UTF-8');
-			if (mt_rand(1, 50) > 48) {
-				if (!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
-					$temp.=$blankness[mt_rand(0, 7)];
-				}
-			}
-			$temp.=$t_str;
-		}
-		return $temp;
-	}
+    /**
+     * @param string $str
+     */
+    function setBlankness($str) {
+        $blankness=array(" ", '　', '҉', '̅̅', '̲', '̲̲', '̅', '̲̲̅̅');
+        $len=iconv_strlen($str, 'UTF-8');
+        $temp='';
+        for ($i=0; $i < $len; $i++) {
+            $t_str=iconv_substr($str, $i, 1, 'UTF-8');
+            if (mt_rand(1, 50) > 48) {
+                if (!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
+                    $temp.=$blankness[mt_rand(0, 7)];
+                }
+            }
+            $temp.=$t_str;
+        }
+        return $temp;
+    }
 	
-	//随机进行繁体中文转换
-	function GbToBig($str) {
-		$len=iconv_strlen($str, 'UTF-8');
-		$temp='';
-		for ($i=0; $i < $len; $i++) {
-			$t_str=iconv_substr($str, $i, 1, 'UTF-8');
-			if (mt_rand(1, 50) > 48) {
-				$t_str=strtr($t_str, $this->GbToBigArray);
-			}
-			$temp.=$t_str;
-		}
-		return $temp;
-	}
+    //随机进行繁体中文转换
+    function GbToBig($str) {
+        $len=iconv_strlen($str, 'UTF-8');
+        $temp='';
+        for ($i=0; $i < $len; $i++) {
+            $t_str=iconv_substr($str, $i, 1, 'UTF-8');
+            if (mt_rand(1, 50) > 48) {
+                $t_str=strtr($t_str, $this->GbToBigArray);
+            }
+            $temp.=$t_str;
+        }
+        return $temp;
+    }
 }
 
 

Spacing +20 added lines, -20 removed lines

@@ -122,18 +122,18 @@ 
 	 * @param string $str
 	 */
 	function setPinyin($str) {
-		$py = mt_rand(0, iconv_strlen( $str, 'UTF-8' )-1);
-		$t_str = iconv_substr( $str, $py, 1, 'UTF-8');
-		if(mt_rand(0,10) > 5) {
-		    $pinyin = " ";
+		$py=mt_rand(0, iconv_strlen($str, 'UTF-8') - 1);
+		$t_str=iconv_substr($str, $py, 1, 'UTF-8');
+		if (mt_rand(0, 10) > 5) {
+		    $pinyin=" ";
 		}
-		$pinyin = $this->_pinyin->convert($t_str,PINYIN_UNICODE);
-        $pinyin=implode(" ",$pinyin);
-		if(mt_rand(0,10) > 5) {
-		    $pinyin .= " ";
+		$pinyin=$this->_pinyin->convert($t_str, PINYIN_UNICODE);
+        $pinyin=implode(" ", $pinyin);
+		if (mt_rand(0, 10) > 5) {
+		    $pinyin.=" ";
 		}
-		if($t_str != "%"){
-			$str = preg_replace("'$t_str'", $pinyin, $str, 1);
+		if ($t_str != "%") {
+			$str=preg_replace("'$t_str'", $pinyin, $str, 1);
 		}
 		return $str;
 	}
@@ -144,18 +144,18 @@ 
 	 * @param string $str
 	 */
 	function setRepeat($str) {
-		$len = iconv_strlen( $str, 'UTF-8' );
-		$action = 0;
-		$temp = '';
-		for( $i=0;  $i<$len; $i++ ){
-			$t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
-			if( mt_rand( 1, 50 ) > 48 && $action == 0) {
-				if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
-					$temp .= $t_str;
-					$action = 1;
+		$len=iconv_strlen($str, 'UTF-8');
+		$action=0;
+		$temp='';
+		for ($i=0; $i < $len; $i++) {
+			$t_str=iconv_substr($str, $i, 1, 'UTF-8');
+			if (mt_rand(1, 50) > 48 && $action == 0) {
+				if (!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
+					$temp.=$t_str;
+					$action=1;
 				}
 			}
-			$temp .= $t_str;
+			$temp.=$t_str;
 		}
 		return $temp;
 	}

core/App.php

Spacing +5 added lines, -5 removed lines

@@ -23,12 +23,12 @@ 
         $this->initContainer();
     }
 
-    private function initEnv(){
-        $dotEnv = new Dotenv($this->basePath);
+    private function initEnv() {
+        $dotEnv=new Dotenv($this->basePath);
         $dotEnv->load();
         date_default_timezone_set(env('APP_TIMEZONE', 'Asia/Shanghai'));
         define('IS_CLI', php_sapi_name() == 'cli');
-        if (env('DEBUG',false)) {
+        if (env('DEBUG', false)) {
             error_reporting(E_ALL);
             @ini_set('display_errors', 'On');
             //@ob_start();
@@ -45,8 +45,8 @@ 
      */
     private function initContainer() {
         static::setInstance($this);
-        $this->instance('app',$this);
-        $this->bind('pinyin','\puck\helpers\PinYin');
+        $this->instance('app', $this);
+        $this->bind('pinyin', '\puck\helpers\PinYin');
     }
 
 }
\ No newline at end of file