Rozbo / puck

core/Controller.php

Doc Comments +4 added lines

@@ -28,6 +28,10 @@
         $function = new \Twig_SimpleFunction('I','I');
         $this->twig->addFunction($function);
     }
+
+    /**
+     * @param string $name
+     */
     protected function assign($name, $value = '')
     {
         if (is_array($name)) {

core/helpers/Dispatch.php

Doc Comments +4 added lines

@@ -62,6 +62,10 @@
         self::param();
         self::exec($class,ACTION_NAME);
     }
+
+    /**
+     * @param string $function
+     */
     static public function exec($class,$function){
         $method = new \ReflectionMethod($class, $function);
         if ($method->isPublic() && !$method->isStatic()) {

core/helpers/Page.php

Doc Comments +2 added lines, -2 removed lines

@@ -46,8 +46,8 @@
      *
      *  pass values when class is istantiated
      *
-     * @param numeric  $_perPage  sets the number of iteems per page
-     * @param numeric  $_instance sets the instance for the GET parameter
+     * @param numeric  $perPage  sets the number of iteems per page
+     * @param numeric  $instance sets the instance for the GET parameter
      */
     public function __construct($perPage,$instance){
         $this->_instance = $instance;

core/Validate.php

Doc Comments +5 added lines, -5 removed lines

@@ -1098,7 +1098,7 @@ 
      * @access protected
      * @param string    $value  字段值
      * @param mixed     $rule  验证规则
-     * @return mixed
+     * @return boolean
      */
     protected function allowIp($value, $rule)
     {
@@ -1110,7 +1110,7 @@ 
      * @access protected
      * @param string    $value  字段值
      * @param mixed     $rule  验证规则
-     * @return mixed
+     * @return boolean
      */
     protected function denyIp($value, $rule)
     {
@@ -1121,8 +1121,8 @@ 
      * 使用正则验证数据
      * @access protected
      * @param mixed     $value  字段值
-     * @param mixed     $rule  验证规则 正则规则或者预定义正则名
-     * @return mixed
+     * @param string     $rule  验证规则 正则规则或者预定义正则名
+     * @return boolean
      */
     protected function regex($value, $rule)
     {
@@ -1140,7 +1140,7 @@ 
      * 验证表单令牌
      * @access protected
      * @param mixed     $value  字段值
-     * @param mixed     $rule  验证规则
+     * @param string     $rule  验证规则
      * @param array     $data  数据
      * @return bool
      */

core/Model.php

Doc Comments +4 added lines

@@ -58,6 +58,10 @@
     public function update($data){
         return $this->db->update($this->table,$data);
     }
+
+    /**
+     * @param string $field
+     */
     public function field($field){
         $this->field=$field;
         return $this;

core/helpers/TimeAgo.php

Doc Comments +4 added lines

@@ -50,6 +50,10 @@
         $this->restoreTimezone();
     }
 
+    /**
+     * @param integer $past
+     * @param integer $now
+     */
     public function inStamp($past, $now = null) {
         if($now==null){
             $now=time();

core/helpers/Chaos.php

Doc Comments +11 added lines

@@ -57,6 +57,9 @@ 
 		$this->msg=$this->prefix.str_replace( '%%%%', $this->url, $this->msg);
 	}
 	
+	/**
+	 * @param string $url
+	 */
 	function setChacha($url ){
 		$url = strtolower($url);
 		$arr = array(
@@ -114,6 +117,10 @@ 
 	}
 
 	//随机把一个字符转为拼音
+
+	/**
+	 * @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');
@@ -146,6 +153,10 @@ 
 	}
 	
 	//随机插入不影响阅读的字符
+
+	/**
+	 * @param string $str
+	 */
 	function setBlankness($str) {
 		$blankness = array(" ", '　', '҉','̅̅','̲','̲̲','̅','̲̲̅̅');
 		$len = iconv_strlen( $str, 'UTF-8' );

Indentation +143 added lines, -143 removed lines

@@ -1,180 +1,180 @@
 <?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);
+    }
 	
-	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','ｚ','Ｚ','Ζ'),
+    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;
+    }
 
-	//随机把一个字符转为拼音
-	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);
+    //随机把一个字符转为拼音
+    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;
+    }
 	
-	//随机重复一个字符
-	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;
-	}
+    //随机重复一个字符
+    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;
+    }
 	
-	//随机插入不影响阅读的字符
-	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 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;
+    }
 }
 
 

core/Container.php

Doc Comments +2 added lines, -3 removed lines

@@ -72,8 +72,7 @@ 
     /**
      * 创建类的实例
      * @access public
-     * @param string    $class    类名或者标识
-     * @param array     $args     变量
+     * @param array     $vars     变量
      * @return object
      */
     public function make($abstract, $vars = [])
@@ -98,7 +97,7 @@ 
     /**
      * 执行函数或者闭包方法 支持参数调用
      * @access public
-     * @param string|array|\Closure $function 函数或者闭包
+     * @param \Closure $function 函数或者闭包
      * @param array                 $vars     变量
      * @return mixed
      */

function.php

Doc Comments +6 added lines, -1 removed lines

@@ -94,7 +94,7 @@ 
 }
 /**
  * session管理函数
- * @param string|array $name session名称 如果为数组则表示进行session设置
+ * @param string $name session名称 如果为数组则表示进行session设置
  * @param mixed $value session值
  * @return mixed
  */
@@ -407,6 +407,11 @@ 
         $value .= ' ';
     }
 }
+/**
+ * @param string $name
+ *
+ * @return string|null
+ */
 function config($name=null,$value=null,$default=null){
     $config=\puck\Conf::load();
     if ($name===null){

Indentation -5 removed lines

@@ -70,15 +70,10 @@
 
 
 /**
-
  * 数据签名认证
-
  * @param  array  $data 被认证的数据
-
  * @return string       签名
-
  * @author 麦当苗儿 <zuojiazi@vip.qq.com>
-
  */
 function data_auth_sign($data) {
     //数据类型检测