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)) {

Spacing +18 added lines, -18 removed lines

@@ -4,44 +4,44 @@ 
 class Controller
 {
 
-    protected $viewPath = '';
+    protected $viewPath='';
     private $twig;
-    private $tVar = array();
+    private $tVar=array();
     protected $title='';
     public function __construct()
     {
-        $loader = new \Twig_Loader_Filesystem(BASE_PATH . $this->viewPath);
-        $twig = new \Twig_Environment($loader, array(
+        $loader=new \Twig_Loader_Filesystem(BASE_PATH.$this->viewPath);
+        $twig=new \Twig_Environment($loader, array(
             'debug' => DEBUG,
-            'cache' => BASE_PATH . '/cache',
+            'cache' => BASE_PATH.'/cache',
         ));
-        $this->twig = $twig;
+        $this->twig=$twig;
         $this->initTwigFilter();
         $this->initTwigFunction();
-        $this->db = \MysqliDb::getInstance();
+        $this->db=\MysqliDb::getInstance();
     }
-    private function initTwigFilter(){
-        $filter = new \Twig_SimpleFilter('long2ip', 'long2ip');
+    private function initTwigFilter() {
+        $filter=new \Twig_SimpleFilter('long2ip', 'long2ip');
         $this->twig->addFilter($filter);
     }
-    private function initTwigFunction(){
-        $function = new \Twig_SimpleFunction('I','I');
+    private function initTwigFunction() {
+        $function=new \Twig_SimpleFunction('I', 'I');
         $this->twig->addFunction($function);
     }
-    protected function assign($name, $value = '')
+    protected function assign($name, $value='')
     {
         if (is_array($name)) {
-            $this->tVar = array_merge($this->tVar, $name);
+            $this->tVar=array_merge($this->tVar, $name);
         } else {
-            $this->tVar[$name] = $value;
+            $this->tVar[$name]=$value;
         }
     }
 
-    protected function show($tmpPath = '')
+    protected function show($tmpPath='')
     {
         if ($tmpPath == '') {
             if (defined("CONTROLLER_NAME") && defined("ACTION_NAME")) {
-                $tmpPath = parse_name(CONTROLLER_NAME) . '/' . parse_name(ACTION_NAME);
+                $tmpPath=parse_name(CONTROLLER_NAME).'/'.parse_name(ACTION_NAME);
             } else {
                 show_json($this->tVar);
             }
@@ -49,8 +49,8 @@ 
         header('Content-Type:text/html; charset=utf-8');
         header('Cache-control: private'); // 页面缓存控制
         header('X-Powered-By:ViviAnAuthSystem');
-        $this->assign('title',$this->title);
-        echo $this->twig->render($tmpPath . '.' . TempExt, $this->tVar);
+        $this->assign('title', $this->title);
+        echo $this->twig->render($tmpPath.'.'.TempExt, $this->tVar);
         die();
     }
 }
\ No newline at end of file

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()) {

Braces +2 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
         self::init();
         if($path==''){
             $path=array();
-        }else{
+        } else{
             $path=str_replace('-','_',$path);
             $path   = explode('/',$path);
         }
@@ -28,8 +28,7 @@ 
         if(count($path)==0){
             array_push($path,'home');
             array_push($path,'index');
-        }
-        elseif (count($path)==1){
+        } elseif (count($path)==1){
             array_push($path,'index');
         }
         if(!empty($path)){

Spacing +34 added lines, -34 removed lines

@@ -6,50 +6,50 @@ 
 
 class Dispatch
 {
-    static public function init(){
-        if(!IS_CLI){
+    static public function init() {
+        if (!IS_CLI) {
             define('NOW_TIME', $_SERVER['REQUEST_TIME']);
             define('REQUEST_METHOD', $_SERVER['REQUEST_METHOD']);
             define('IS_GET', REQUEST_METHOD == 'GET' ? true : false);
             define('IS_POST', REQUEST_METHOD == 'POST' ? true : false);
             define('IS_PUT', REQUEST_METHOD == 'PUT' ? true : false);
             define('IS_DELETE', REQUEST_METHOD == 'DELETE' ? true : false);
-            define('IS_AJAX', ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') ) ? true : false);
+            define('IS_AJAX', ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')) ? true : false);
             define('__SELF__', strip_tags($_SERVER['REQUEST_URI']));
         }
     }
-    static public function dispatch($path='',$app='\\admin') {
+    static public function dispatch($path='', $app='\\admin') {
         self::init();
-        if($path==''){
+        if ($path == '') {
             $path=array();
-        }else{
-            $path=str_replace('-','_',$path);
-            $path   = explode('/',$path);
+        } else {
+            $path=str_replace('-', '_', $path);
+            $path=explode('/', $path);
         }
 
-        if(count($path)==0){
-            array_push($path,'home');
-            array_push($path,'index');
+        if (count($path) == 0) {
+            array_push($path, 'home');
+            array_push($path, 'index');
         }
-        elseif (count($path)==1){
-            array_push($path,'index');
+        elseif (count($path) == 1) {
+            array_push($path, 'index');
         }
-        if(!empty($path)){
+        if (!empty($path)) {
             $tmpAction=array_pop($path);
             $tmpAction=preg_replace('/\.(html|aspx|do|php|htm|h5|api)$/i', '', $tmpAction);
-            $tmpAction=parse_name($tmpAction,1);
+            $tmpAction=parse_name($tmpAction, 1);
             $var['a']=$tmpAction;
         }
-        define('ACTION_NAME',$var['a']);
+        define('ACTION_NAME', $var['a']);
         if (!preg_match('/^[A-Za-z](\w)*$/', ACTION_NAME)) {
             die("error action");
         }
-        if(!empty($path)){
+        if (!empty($path)) {
             $tmpController=array_pop($path);
-            $tmpController=parse_name($tmpController,1);
+            $tmpController=parse_name($tmpController, 1);
             $var['c']=$tmpController;
         }
-        define('CONTROLLER_NAME',$var['c']);
+        define('CONTROLLER_NAME', $var['c']);
         if (!preg_match('/^[A-Za-z](\/|\w)*$/', CONTROLLER_NAME)) {
             die("error controller");
         }
@@ -57,20 +57,20 @@ 
         if (!class_exists($class)) {
             not_found('this controller is can not work now!');
         }
-        $class= new $class();
-        if (!method_exists($class,ACTION_NAME)) {
+        $class=new $class();
+        if (!method_exists($class, ACTION_NAME)) {
             not_found();
         }
         self::param();
-        self::exec($class,ACTION_NAME);
+        self::exec($class, ACTION_NAME);
     }
-    static public function exec($class,$function){
-        $method = new \ReflectionMethod($class, $function);
+    static public function exec($class, $function) {
+        $method=new \ReflectionMethod($class, $function);
         if ($method->isPublic() && !$method->isStatic()) {
-            $refClass = new \ReflectionClass($class);
+            $refClass=new \ReflectionClass($class);
             //前置方法
-            if ($refClass->hasMethod('_before_' . $function)) {
-                $before = $refClass->getMethod('_before_' . $function);
+            if ($refClass->hasMethod('_before_'.$function)) {
+                $before=$refClass->getMethod('_before_'.$function);
                 if ($before->isPublic()) {
                     $before->invoke($class);
                 }
@@ -78,8 +78,8 @@ 
             //方法本身
             $response=$method->invoke($class);
             //后置方法
-            if ($refClass->hasMethod('_after_' . $function)) {
-                $after = $refClass->getMethod('_after_' . $function);
+            if ($refClass->hasMethod('_after_'.$function)) {
+                $after=$refClass->getMethod('_after_'.$function);
                 if ($after->isPublic()) {
                     $after->invoke($class);
                 }
@@ -87,17 +87,17 @@ 
             self::render($response);
         }
     }
-    static public function param(){
-        if(!IS_CLI){
+    static public function param() {
+        if (!IS_CLI) {
             $vars=array();
-            parse_str(parse_url($_SERVER['REQUEST_URI'],PHP_URL_QUERY),$vars);
+            parse_str(parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY), $vars);
             $_GET=$vars;
         }
 
     }
-    static public function render($res){
+    static public function render($res) {
         $response=$res;
-        if(is_array($res)){
+        if (is_array($res)) {
             $response=json($res);
         }
         echo $response;

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;

Spacing +57 added lines, -57 removed lines

@@ -3,7 +3,7 @@ 
 
 namespace puck\helpers;
 
-class Page{
+class Page {
     /**
      * set the number of items per page.
      *
@@ -37,7 +37,7 @@ 
      *
      * @var numeric
      */
-    private $_totalRows = 0;
+    private $_totalRows=0;
 
 
 
@@ -49,9 +49,9 @@ 
      * @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;
-        $this->_perPage = $perPage;
+    public function __construct($perPage, $instance) {
+        $this->_instance=$instance;
+        $this->_perPage=$perPage;
         $this->set_instance();
     }
 
@@ -61,7 +61,7 @@ 
      * creates the starting point for limiting the dataset
      * @return numeric
      */
-    public function get_start(){
+    public function get_start() {
         return ($this->_page * $this->_perPage) - $this->_perPage;
     }
 
@@ -72,9 +72,9 @@ 
      *
      * @var numeric
      */
-    private function set_instance(){
-        $this->_page = (int) (!isset($_GET[$this->_instance]) ? 1 : $_GET[$this->_instance]);
-        $this->_page = ($this->_page == 0 ? 1 : $this->_page);
+    private function set_instance() {
+        $this->_page=(int) (!isset($_GET[$this->_instance]) ? 1 : $_GET[$this->_instance]);
+        $this->_page=($this->_page == 0 ? 1 : $this->_page);
     }
 
     /**
@@ -84,8 +84,8 @@ 
      *
      * @var numeric
      */
-    public function set_total($_totalRows){
-        $this->_totalRows = $_totalRows;
+    public function set_total($_totalRows) {
+        $this->_totalRows=$_totalRows;
     }
 
     /**
@@ -95,18 +95,18 @@ 
      *
      * @return string
      */
-    public function get_limit(){
+    public function get_limit() {
         return "LIMIT ".$this->get_start().",$this->_perPage";
     }
 
 
-    private function getParam(){
+    private function getParam() {
         $vars=$_GET;
-        if(isset($vars[$this->_instance])){
+        if (isset($vars[$this->_instance])) {
             unset($vars[$this->_instance]);
         }
         $str=http_build_query($vars);
-        $str ='&'.$str;
+        $str='&'.$str;
         return $str;
     }
 
@@ -119,86 +119,86 @@ 
      * @var sting $ext optionally pass in extra parameters to the GET
      * @return string returns the html menu
      */
-    public function page_links($path='?',$ext=null)
+    public function page_links($path='?', $ext=null)
     {
-        $adjacents = "2";
-        $prev = $this->_page - 1;
-        $next = $this->_page + 1;
-        $lastpage = ceil($this->_totalRows/$this->_perPage);
-        $lpm1 = $lastpage - 1;
-        $pagination = "";
-        if($lastpage > 1)
+        $adjacents="2";
+        $prev=$this->_page - 1;
+        $next=$this->_page + 1;
+        $lastpage=ceil($this->_totalRows / $this->_perPage);
+        $lpm1=$lastpage - 1;
+        $pagination="";
+        if ($lastpage > 1)
         {
-            if($ext==null){
+            if ($ext == null) {
                 $ext=$this->getParam();
             }
-            $pagination .= "<ul class='pager'>";
+            $pagination.="<ul class='pager'>";
             if ($this->_page > 1)
-                $pagination.= "<li class='previous'><a href='".$path."$this->_instance=$prev"."$ext'><<</a></li>";
+                $pagination.="<li class='previous'><a href='".$path."$this->_instance=$prev"."$ext'><<</a></li>";
             else
-                $pagination.= "<li class='disabled previous'><span class='disabled'><<</span></li>";
+                $pagination.="<li class='disabled previous'><span class='disabled'><<</span></li>";
 
             if ($lastpage < 7 + ($adjacents * 2))
             {
-                for ($counter = 1; $counter <= $lastpage; $counter++)
+                for ($counter=1; $counter <= $lastpage; $counter++)
                 {
                     if ($counter == $this->_page)
-                        $pagination.= "<li class='current'><span>$counter</span></li>";
+                        $pagination.="<li class='current'><span>$counter</span></li>";
                     else
-                        $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        $pagination.="<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
                 }
             }
-            elseif($lastpage > 5 + ($adjacents * 2))
+            elseif ($lastpage > 5 + ($adjacents * 2))
             {
-                if($this->_page < 1 + ($adjacents * 2))
+                if ($this->_page < 1 + ($adjacents * 2))
                 {
-                    for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++)
+                    for ($counter=1; $counter < 4 + ($adjacents * 2); $counter++)
                     {
                         if ($counter == $this->_page)
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
+                            $pagination.="<li class='current'><span>$counter</span></li>";
                         else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                            $pagination.="<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
                     }
-                    $pagination.= "...";
-                    $pagination.= "<li><a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a></li>";
-                    $pagination.= "<li><a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a></li>";
+                    $pagination.="...";
+                    $pagination.="<li><a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a></li>";
+                    $pagination.="<li><a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a></li>";
                 }
-                elseif($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
+                elseif ($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
                 {
-                    $pagination.= "<li><a href='".$path."$this->_instance=1"."$ext'>1</a></li>";
-                    $pagination.= "<li><a href='".$path."$this->_instance=2"."$ext'>2</a></li>";
-                    $pagination.= "...";
-                    for ($counter = $this->_page - $adjacents; $counter <= $this->_page + $adjacents; $counter++)
+                    $pagination.="<li><a href='".$path."$this->_instance=1"."$ext'>1</a></li>";
+                    $pagination.="<li><a href='".$path."$this->_instance=2"."$ext'>2</a></li>";
+                    $pagination.="...";
+                    for ($counter=$this->_page - $adjacents; $counter <= $this->_page + $adjacents; $counter++)
                     {
                         if ($counter == $this->_page)
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
+                            $pagination.="<li class='current'><span>$counter</span></li>";
                         else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                            $pagination.="<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
                     }
-                    $pagination.= "..";
-                    $pagination.= "<li><a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a></li>";
-                    $pagination.= "<li><a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a></li>";
+                    $pagination.="..";
+                    $pagination.="<li><a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a></li>";
+                    $pagination.="<li><a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a></li>";
                 }
                 else
                 {
-                    $pagination.= "<li><a href='".$path."$this->_instance=1"."$ext'>1</a></li>";
-                    $pagination.= "<li><a href='".$path."$this->_instance=2"."$ext'>2</a></li>";
-                    $pagination.= "..";
-                    for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++)
+                    $pagination.="<li><a href='".$path."$this->_instance=1"."$ext'>1</a></li>";
+                    $pagination.="<li><a href='".$path."$this->_instance=2"."$ext'>2</a></li>";
+                    $pagination.="..";
+                    for ($counter=$lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++)
                     {
                         if ($counter == $this->_page)
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
+                            $pagination.="<li class='current'><span>$counter</span></li>";
                         else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                            $pagination.="<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
                     }
                 }
             }
 
             if ($this->_page < $counter - 1)
-                $pagination.= "<li class='next'><a href='".$path."$this->_instance=$next"."$ext'>>></a></li>";
+                $pagination.="<li class='next'><a href='".$path."$this->_instance=$next"."$ext'>>></a></li>";
             else
-                $pagination.= "<li class='next disabled'><span class='disabled'>>></span></li>";
-            $pagination.= "</ul>\n";
+                $pagination.="<li class='next disabled'><span class='disabled'>>></span></li>";
+            $pagination.="</ul>\n";
         }
 
 

Braces +33 added lines, -30 removed lines

@@ -133,71 +133,74 @@
                 $ext=$this->getParam();
             }
             $pagination .= "<ul class='pager'>";
-            if ($this->_page > 1)
-                $pagination.= "<li class='previous'><a href='".$path."$this->_instance=$prev"."$ext'><<</a></li>";
-            else
-                $pagination.= "<li class='disabled previous'><span class='disabled'><<</span></li>";
+            if ($this->_page > 1) {
+                            $pagination.= "<li class='previous'><a href='".$path."$this->_instance=$prev"."$ext'><<</a></li>";
+            } else {
+                            $pagination.= "<li class='disabled previous'><span class='disabled'><<</span></li>";
+            }
 
             if ($lastpage < 7 + ($adjacents * 2))
             {
                 for ($counter = 1; $counter <= $lastpage; $counter++)
                 {
-                    if ($counter == $this->_page)
-                        $pagination.= "<li class='current'><span>$counter</span></li>";
-                    else
-                        $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                    if ($counter == $this->_page) {
+                                            $pagination.= "<li class='current'><span>$counter</span></li>";
+                    } else {
+                                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                    }
                 }
-            }
-            elseif($lastpage > 5 + ($adjacents * 2))
+            } elseif($lastpage > 5 + ($adjacents * 2))
             {
                 if($this->_page < 1 + ($adjacents * 2))
                 {
                     for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++)
                     {
-                        if ($counter == $this->_page)
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
-                        else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        if ($counter == $this->_page) {
+                                                    $pagination.= "<li class='current'><span>$counter</span></li>";
+                        } else {
+                                                    $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        }
                     }
                     $pagination.= "...";
                     $pagination.= "<li><a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a></li>";
                     $pagination.= "<li><a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a></li>";
-                }
-                elseif($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
+                } elseif($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
                 {
                     $pagination.= "<li><a href='".$path."$this->_instance=1"."$ext'>1</a></li>";
                     $pagination.= "<li><a href='".$path."$this->_instance=2"."$ext'>2</a></li>";
                     $pagination.= "...";
                     for ($counter = $this->_page - $adjacents; $counter <= $this->_page + $adjacents; $counter++)
                     {
-                        if ($counter == $this->_page)
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
-                        else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        if ($counter == $this->_page) {
+                                                    $pagination.= "<li class='current'><span>$counter</span></li>";
+                        } else {
+                                                    $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        }
                     }
                     $pagination.= "..";
                     $pagination.= "<li><a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a></li>";
                     $pagination.= "<li><a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a></li>";
-                }
-                else
+                } else
                 {
                     $pagination.= "<li><a href='".$path."$this->_instance=1"."$ext'>1</a></li>";
                     $pagination.= "<li><a href='".$path."$this->_instance=2"."$ext'>2</a></li>";
                     $pagination.= "..";
                     for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++)
                     {
-                        if ($counter == $this->_page)
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
-                        else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        if ($counter == $this->_page) {
+                                                    $pagination.= "<li class='current'><span>$counter</span></li>";
+                        } else {
+                                                    $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        }
                     }
                 }
             }
 
-            if ($this->_page < $counter - 1)
-                $pagination.= "<li class='next'><a href='".$path."$this->_instance=$next"."$ext'>>></a></li>";
-            else
-                $pagination.= "<li class='next disabled'><span class='disabled'>>></span></li>";
+            if ($this->_page < $counter - 1) {
+                            $pagination.= "<li class='next'><a href='".$path."$this->_instance=$next"."$ext'>>></a></li>";
+            } else {
+                            $pagination.= "<li class='next disabled'><span class='disabled'>>></span></li>";
+            }
             $pagination.= "</ul>\n";
         }
 

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
      */

Spacing +179 added lines, -179 removed lines

@@ -11,23 +11,23 @@ 
     protected static $instance;
 
     // 自定义的验证类型
-    protected static $type = [];
+    protected static $type=[];
 
     // 验证类型别名
-    protected $alias = [
+    protected $alias=[
         '>' => 'gt', '>=' => 'egt', '<' => 'lt', '<=' => 'elt', '=' => 'eq', 'same' => 'eq',
     ];
 
     // 当前验证的规则
-    protected $rule = [];
+    protected $rule=[];
 
     // 验证提示信息
-    protected $message = [];
+    protected $message=[];
     // 验证字段描述
-    protected $field = [];
+    protected $field=[];
 
     // 验证规则默认提示信息
-    protected static $typeMsg = [
+    protected static $typeMsg=[
         'require'     => ':attribute不能为空',
         'number'      => ':attribute必须是数字',
         'float'       => ':attribute必须是浮点数',
@@ -79,19 +79,19 @@ 
     ];
 
     // 当前验证场景
-    protected $currentScene = null;
+    protected $currentScene=null;
 
     // 正则表达式 regex = ['zip'=>'\d{6}',...]
-    protected $regex = [];
+    protected $regex=[];
 
     // 验证场景 scene = ['edit'=>'name1,name2,...']
-    protected $scene = [];
+    protected $scene=[];
 
     // 验证失败错误信息
-    protected $error = [];
+    protected $error=[];
 
     // 批量验证
-    protected $batch = false;
+    protected $batch=false;
 
     /**
      * 构造函数
@@ -100,11 +100,11 @@ 
      * @param array $message 验证提示信息
      * @param array $field 验证字段描述信息
      */
-    public function __construct(array $rules = [], $message = [], $field = [])
+    public function __construct(array $rules=[], $message=[], $field=[])
     {
-        $this->rule    = array_merge($this->rule, $rules);
-        $this->message = array_merge($this->message, $message);
-        $this->field   = array_merge($this->field, $field);
+        $this->rule=array_merge($this->rule, $rules);
+        $this->message=array_merge($this->message, $message);
+        $this->field=array_merge($this->field, $field);
     }
 
     /**
@@ -115,10 +115,10 @@ 
      * @param array     $field 验证字段描述信息
      * @return Validate
      */
-    public static function make($rules = [], $message = [], $field = [])
+    public static function make($rules=[], $message=[], $field=[])
     {
         if (is_null(self::$instance)) {
-            self::$instance = new self($rules, $message, $field);
+            self::$instance=new self($rules, $message, $field);
         }
         return self::$instance;
     }
@@ -130,12 +130,12 @@ 
      * @param mixed         $rule  验证规则
      * @return Validate
      */
-    public function rule($name, $rule = '')
+    public function rule($name, $rule='')
     {
         if (is_array($name)) {
-            $this->rule = array_merge($this->rule, $name);
+            $this->rule=array_merge($this->rule, $name);
         } else {
-            $this->rule[$name] = $rule;
+            $this->rule[$name]=$rule;
         }
         return $this;
     }
@@ -147,12 +147,12 @@ 
      * @param mixed     $callback callback方法(或闭包)
      * @return void
      */
-    public static function extend($type, $callback = null)
+    public static function extend($type, $callback=null)
     {
         if (is_array($type)) {
-            self::$type = array_merge(self::$type, $type);
+            self::$type=array_merge(self::$type, $type);
         } else {
-            self::$type[$type] = $callback;
+            self::$type[$type]=$callback;
         }
     }
 
@@ -163,12 +163,12 @@ 
      * @param string        $msg  验证提示信息
      * @return void
      */
-    public static function setTypeMsg($type, $msg = null)
+    public static function setTypeMsg($type, $msg=null)
     {
         if (is_array($type)) {
-            self::$typeMsg = array_merge(self::$typeMsg, $type);
+            self::$typeMsg=array_merge(self::$typeMsg, $type);
         } else {
-            self::$typeMsg[$type] = $msg;
+            self::$typeMsg[$type]=$msg;
         }
     }
 
@@ -179,12 +179,12 @@ 
      * @param string        $message 提示信息
      * @return Validate
      */
-    public function message($name, $message = '')
+    public function message($name, $message='')
     {
         if (is_array($name)) {
-            $this->message = array_merge($this->message, $name);
+            $this->message=array_merge($this->message, $name);
         } else {
-            $this->message[$name] = $message;
+            $this->message[$name]=$message;
         }
         return $this;
     }
@@ -196,16 +196,16 @@ 
      * @param mixed         $fields 要验证的字段
      * @return Validate
      */
-    public function scene($name, $fields = null)
+    public function scene($name, $fields=null)
     {
         if (is_array($name)) {
-            $this->scene = array_merge($this->scene, $name);
+            $this->scene=array_merge($this->scene, $name);
         }if (is_null($fields)) {
         // 设置当前场景
-        $this->currentScene = $name;
+        $this->currentScene=$name;
     } else {
         // 设置验证场景
-        $this->scene[$name] = $fields;
+        $this->scene[$name]=$fields;
     }
         return $this;
     }
@@ -227,9 +227,9 @@ 
      * @param bool $batch  是否批量验证
      * @return Validate
      */
-    public function batch($batch = true)
+    public function batch($batch=true)
     {
-        $this->batch = $batch;
+        $this->batch=$batch;
         return $this;
     }
 
@@ -241,27 +241,27 @@ 
      * @param string    $scene 验证场景
      * @return bool
      */
-    public function check($data, $rules = [], $scene = '')
+    public function check($data, $rules=[], $scene='')
     {
-        $this->error = [];
+        $this->error=[];
 
         if (empty($rules)) {
             // 读取验证规则
-            $rules = $this->rule;
+            $rules=$this->rule;
         }
 
         // 分析验证规则
-        $scene = $this->getScene($scene);
+        $scene=$this->getScene($scene);
         if (is_array($scene)) {
             // 处理场景验证字段
-            $change = [];
-            $array  = [];
+            $change=[];
+            $array=[];
             foreach ($scene as $k => $val) {
                 if (is_numeric($k)) {
-                    $array[] = $val;
+                    $array[]=$val;
                 } else {
-                    $array[]    = $k;
-                    $change[$k] = $val;
+                    $array[]=$k;
+                    $change[$k]=$val;
                 }
             }
         }
@@ -270,22 +270,22 @@ 
             // field => rule1|rule2... field=>['rule1','rule2',...]
             if (is_numeric($key)) {
                 // [field,rule1|rule2,msg1|msg2]
-                $key  = $item[0];
-                $rule = $item[1];
+                $key=$item[0];
+                $rule=$item[1];
                 if (isset($item[2])) {
-                    $msg = is_string($item[2]) ? explode('|', $item[2]) : $item[2];
+                    $msg=is_string($item[2]) ? explode('|', $item[2]) : $item[2];
                 } else {
-                    $msg = [];
+                    $msg=[];
                 }
             } else {
-                $rule = $item;
-                $msg  = [];
+                $rule=$item;
+                $msg=[];
             }
             if (strpos($key, '|')) {
                 // 字段|描述 用于指定属性名称
-                list($key, $title) = explode('|', $key);
+                list($key, $title)=explode('|', $key);
             } else {
-                $title = isset($this->field[$key]) ? $this->field[$key] : $key;
+                $title=isset($this->field[$key]) ? $this->field[$key] : $key;
             }
 
             // 场景检测
@@ -297,20 +297,20 @@ 
                         continue;
                     } elseif (isset($change[$key])) {
                         // 重载某个验证规则
-                        $rule = $change[$key];
+                        $rule=$change[$key];
                     }
                 }
             }
 
             // 获取数据 支持二维数组
-            $value = $this->getDataValue($data, $key);
+            $value=$this->getDataValue($data, $key);
 
             // 字段验证
             if ($rule instanceof \Closure) {
                 // 匿名函数验证 支持传入当前字段和所有字段两个数据
-                $result = call_user_func_array($rule, [$value, $data]);
+                $result=call_user_func_array($rule, [$value, $data]);
             } else {
-                $result = $this->checkItem($key, $value, $rule, $data, $title, $msg);
+                $result=$this->checkItem($key, $value, $rule, $data, $title, $msg);
             }
 
             if (true !== $result) {
@@ -318,12 +318,12 @@ 
                 if (!empty($this->batch)) {
                     // 批量验证
                     if (is_array($result)) {
-                        $this->error = array_merge($this->error, $result);
+                        $this->error=array_merge($this->error, $result);
                     } else {
-                        $this->error[$key] = $result;
+                        $this->error[$key]=$result;
                     }
                 } else {
-                    $this->error = $result;
+                    $this->error=$result;
                     return false;
                 }
             }
@@ -342,65 +342,65 @@ 
      * @param array     $msg  提示信息
      * @return mixed
      */
-    protected function checkItem($field, $value, $rules, $data, $title = '', $msg = [])
+    protected function checkItem($field, $value, $rules, $data, $title='', $msg=[])
     {
         // 支持多规则验证 require|in:a,b,c|... 或者 ['require','in'=>'a,b,c',...]
         if (is_string($rules)) {
-            $rules = explode('|', $rules);
+            $rules=explode('|', $rules);
         }
-        $i = 0;
+        $i=0;
         foreach ($rules as $key => $rule) {
             if ($rule instanceof \Closure) {
-                $result = call_user_func_array($rule, [$value, $data]);
-                $info   = is_numeric($key) ? '' : $key;
+                $result=call_user_func_array($rule, [$value, $data]);
+                $info=is_numeric($key) ? '' : $key;
             } else {
                 // 判断验证类型
                 if (is_numeric($key)) {
                     if (strpos($rule, ':')) {
-                        list($type, $rule) = explode(':', $rule, 2);
+                        list($type, $rule)=explode(':', $rule, 2);
                         if (isset($this->alias[$type])) {
                             // 判断别名
-                            $type = $this->alias[$type];
+                            $type=$this->alias[$type];
                         }
-                        $info = $type;
+                        $info=$type;
                     } elseif (method_exists($this, $rule)) {
-                        $type = $rule;
-                        $info = $rule;
-                        $rule = '';
+                        $type=$rule;
+                        $info=$rule;
+                        $rule='';
                     } else {
-                        $type = 'is';
-                        $info = $rule;
+                        $type='is';
+                        $info=$rule;
                     }
                 } else {
-                    $info = $type = $key;
+                    $info=$type=$key;
                 }
 
                 // 如果不是require 有数据才会行验证
                 if (0 === strpos($info, 'require') || (!is_null($value) && '' !== $value)) {
                     // 验证类型
-                    $callback = isset(self::$type[$type]) ? self::$type[$type] : [$this, $type];
+                    $callback=isset(self::$type[$type]) ? self::$type[$type] : [$this, $type];
                     // 验证数据
-                    $result = call_user_func_array($callback, [$value, $rule, $data, $field, $title]);
+                    $result=call_user_func_array($callback, [$value, $rule, $data, $field, $title]);
                 } else {
-                    $result = true;
+                    $result=true;
                 }
             }
 
             if (false === $result) {
                 // 验证失败 返回错误信息
                 if (isset($msg[$i])) {
-                    $message = $msg[$i];
+                    $message=$msg[$i];
                     if (is_string($message) && strpos($message, '{%') === 0) {
-                        $message = Lang::get(substr($message, 2, -1));
+                        $message=Lang::get(substr($message, 2, -1));
                     }
                 } else {
-                    $message = $this->getRuleMsg($field, $title, $info, $rule);
+                    $message=$this->getRuleMsg($field, $title, $info, $rule);
                 }
                 return $message;
             } elseif (true !== $result) {
                 // 返回自定义错误信息
                 if (is_string($result) && false !== strpos($result, ':')) {
-                    $result = str_replace([':attribute', ':rule'], [$title, (string) $rule], $result);
+                    $result=str_replace([':attribute', ':rule'], [$title, (string) $rule], $result);
                 }
                 return $result;
             }
@@ -418,13 +418,13 @@ 
      * @param string    $field 字段名
      * @return bool
      */
-    protected function confirm($value, $rule, $data, $field = '')
+    protected function confirm($value, $rule, $data, $field='')
     {
         if ('' == $rule) {
             if (strpos($field, '_confirm')) {
-                $rule = strstr($field, '_confirm', true);
+                $rule=strstr($field, '_confirm', true);
             } else {
-                $rule = $field . '_confirm';
+                $rule=$field.'_confirm';
             }
         }
         return $this->getDataValue($data, $rule) === $value;
@@ -511,100 +511,100 @@ 
      * @param array     $data  验证数据
      * @return bool
      */
-    protected function is($value, $rule, $data = [])
+    protected function is($value, $rule, $data=[])
     {
         switch ($rule) {
             case 'require':
                 // 必须
-                $result = !empty($value) || '0' == $value;
+                $result=!empty($value) || '0' == $value;
                 break;
             case 'accepted':
                 // 接受
-                $result = in_array($value, ['1', 'on', 'yes']);
+                $result=in_array($value, ['1', 'on', 'yes']);
                 break;
             case 'date':
                 // 是否是一个有效日期
-                $result = false !== strtotime($value);
+                $result=false !== strtotime($value);
                 break;
             case 'alpha':
                 // 只允许字母
-                $result = $this->regex($value, '/^[A-Za-z]+$/');
+                $result=$this->regex($value, '/^[A-Za-z]+$/');
                 break;
             case 'alphaNum':
                 // 只允许字母和数字
-                $result = $this->regex($value, '/^[A-Za-z0-9]+$/');
+                $result=$this->regex($value, '/^[A-Za-z0-9]+$/');
                 break;
             case 'alphaDash':
                 // 只允许字母、数字和下划线 破折号
-                $result = $this->regex($value, '/^[A-Za-z0-9\-\_]+$/');
+                $result=$this->regex($value, '/^[A-Za-z0-9\-\_]+$/');
                 break;
             case 'chs':
                 // 只允许汉字
-                $result = $this->regex($value, '/^[\x{4e00}-\x{9fa5}]+$/u');
+                $result=$this->regex($value, '/^[\x{4e00}-\x{9fa5}]+$/u');
                 break;
             case 'chsAlpha':
                 // 只允许汉字、字母
-                $result = $this->regex($value, '/^[\x{4e00}-\x{9fa5}a-zA-Z]+$/u');
+                $result=$this->regex($value, '/^[\x{4e00}-\x{9fa5}a-zA-Z]+$/u');
                 break;
             case 'chsAlphaNum':
                 // 只允许汉字、字母和数字
-                $result = $this->regex($value, '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9]+$/u');
+                $result=$this->regex($value, '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9]+$/u');
                 break;
             case 'chsDash':
                 // 只允许汉字、字母、数字和下划线_及破折号-
-                $result = $this->regex($value, '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9\_\-]+$/u');
+                $result=$this->regex($value, '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9\_\-]+$/u');
                 break;
             case 'activeUrl':
                 // 是否为有效的网址
-                $result = checkdnsrr($value);
+                $result=checkdnsrr($value);
                 break;
             case 'ip':
                 // 是否为IP地址
-                $result = $this->filter($value, [FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6]);
+                $result=$this->filter($value, [FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6]);
                 break;
             case 'url':
                 // 是否为一个URL地址
-                $result = $this->filter($value, FILTER_VALIDATE_URL);
+                $result=$this->filter($value, FILTER_VALIDATE_URL);
                 break;
             case 'float':
                 // 是否为float
-                $result = $this->filter($value, FILTER_VALIDATE_FLOAT);
+                $result=$this->filter($value, FILTER_VALIDATE_FLOAT);
                 break;
             case 'number':
-                $result = is_numeric($value);
+                $result=is_numeric($value);
                 break;
             case 'integer':
                 // 是否为整型
-                $result = $this->filter($value, FILTER_VALIDATE_INT);
+                $result=$this->filter($value, FILTER_VALIDATE_INT);
                 break;
             case 'email':
                 // 是否为邮箱地址
-                $result = $this->filter($value, FILTER_VALIDATE_EMAIL);
+                $result=$this->filter($value, FILTER_VALIDATE_EMAIL);
                 break;
             case 'boolean':
                 // 是否为布尔值
-                $result = in_array($value, [true, false, 0, 1, '0', '1'], true);
+                $result=in_array($value, [true, false, 0, 1, '0', '1'], true);
                 break;
             case 'array':
                 // 是否为数组
-                $result = is_array($value);
+                $result=is_array($value);
                 break;
             case 'file':
-                $result = $value instanceof File;
+                $result=$value instanceof File;
                 break;
             case 'image':
-                $result = $value instanceof File && in_array($this->getImageType($value->getRealPath()), [1, 2, 3, 6]);
+                $result=$value instanceof File && in_array($this->getImageType($value->getRealPath()), [1, 2, 3, 6]);
                 break;
             case 'token':
-                $result = $this->token($value, '__token__', $data);
+                $result=$this->token($value, '__token__', $data);
                 break;
             default:
                 if (isset(self::$type[$rule])) {
                     // 注册的验证规则
-                    $result = call_user_func_array(self::$type[$rule], [$value]);
+                    $result=call_user_func_array(self::$type[$rule], [$value]);
                 } else {
                     // 正则验证
-                    $result = $this->regex($value, $rule);
+                    $result=$this->regex($value, $rule);
                 }
         }
         return $result;
@@ -616,7 +616,7 @@ 
         if (function_exists('exif_imagetype')) {
             return exif_imagetype($image);
         } else {
-            $info = getimagesize($image);
+            $info=getimagesize($image);
             return $info[2];
         }
     }
@@ -631,7 +631,7 @@ 
     protected function activeUrl($value, $rule)
     {
         if (!in_array($rule, ['A', 'MX', 'NS', 'SOA', 'PTR', 'CNAME', 'AAAA', 'A6', 'SRV', 'NAPTR', 'TXT', 'ANY'])) {
-            $rule = 'MX';
+            $rule='MX';
         }
         return checkdnsrr($value, $rule);
     }
@@ -646,7 +646,7 @@ 
     protected function ip($value, $rule)
     {
         if (!in_array($rule, ['ipv4', 'ipv6'])) {
-            $rule = 'ipv4';
+            $rule='ipv4';
         }
         return $this->filter($value, [FILTER_VALIDATE_IP, 'ipv6' == $rule ? FILTER_FLAG_IPV6 : FILTER_FLAG_IPV4]);
     }
@@ -664,7 +664,7 @@ 
             return false;
         }
         if (is_string($rule)) {
-            $rule = explode(',', $rule);
+            $rule=explode(',', $rule);
         }
         if (is_array($file)) {
             foreach ($file as $item) {
@@ -691,7 +691,7 @@ 
             return false;
         }
         if (is_string($rule)) {
-            $rule = explode(',', $rule);
+            $rule=explode(',', $rule);
         }
         if (is_array($file)) {
             foreach ($file as $item) {
@@ -742,19 +742,19 @@ 
             return false;
         }
         if ($rule) {
-            $rule                        = explode(',', $rule);
-            list($width, $height, $type) = getimagesize($file->getRealPath());
+            $rule=explode(',', $rule);
+            list($width, $height, $type)=getimagesize($file->getRealPath());
             if (isset($rule[2])) {
-                $imageType = strtolower($rule[2]);
+                $imageType=strtolower($rule[2]);
                 if ('jpeg' == $imageType) {
-                    $imageType = 'jpg';
+                    $imageType='jpg';
                 }
                 if (image_type_to_extension($type, false) != $imageType) {
                     return false;
                 }
             }
 
-            list($w, $h) = $rule;
+            list($w, $h)=$rule;
             return $w == $width && $h == $height;
         } else {
             return in_array($this->getImageType($file->getRealPath()), [1, 2, 3, 6]);
@@ -770,7 +770,7 @@ 
      */
     protected function method($value, $rule)
     {
-        $method = Request::instance()->method();
+        $method=Request::instance()->method();
         return strtoupper($rule) == $method;
     }
 
@@ -783,7 +783,7 @@ 
      */
     protected function dateFormat($value, $rule)
     {
-        $info = date_parse_from_format($rule, $value);
+        $info=date_parse_from_format($rule, $value);
         return 0 == $info['warning_count'] && 0 == $info['error_count'];
     }
 
@@ -799,37 +799,37 @@ 
     protected function unique($value, $rule, $data, $field)
     {
         if (is_string($rule)) {
-            $rule = explode(',', $rule);
+            $rule=explode(',', $rule);
         }
         if (false !== strpos($rule[0], '\\')) {
             // 指定模型类
-            $db = new $rule[0];
+            $db=new $rule[0];
         } else {
             try {
-                $db = Loader::model($rule[0]);
+                $db=Loader::model($rule[0]);
             } catch (ClassNotFoundException $e) {
-                $db = Db::name($rule[0]);
+                $db=Db::name($rule[0]);
             }
         }
-        $key = isset($rule[1]) ? $rule[1] : $field;
+        $key=isset($rule[1]) ? $rule[1] : $field;
 
         if (strpos($key, '^')) {
             // 支持多个字段验证
-            $fields = explode('^', $key);
+            $fields=explode('^', $key);
             foreach ($fields as $key) {
-                $map[$key] = $data[$key];
+                $map[$key]=$data[$key];
             }
         } elseif (strpos($key, '=')) {
             parse_str($key, $map);
         } else {
-            $map[$key] = $data[$field];
+            $map[$key]=$data[$field];
         }
 
-        $pk = strval(isset($rule[3]) ? $rule[3] : $db->getPk());
+        $pk=strval(isset($rule[3]) ? $rule[3] : $db->getPk());
         if (isset($rule[2])) {
-            $map[$pk] = ['neq', $rule[2]];
+            $map[$pk]=['neq', $rule[2]];
         } elseif (isset($data[$pk])) {
-            $map[$pk] = ['neq', $data[$pk]];
+            $map[$pk]=['neq', $data[$pk]];
         }
 
         if ($db->where($map)->field($pk)->find()) {
@@ -861,12 +861,12 @@ 
     protected function filter($value, $rule)
     {
         if (is_string($rule) && strpos($rule, ',')) {
-            list($rule, $param) = explode(',', $rule);
+            list($rule, $param)=explode(',', $rule);
         } elseif (is_array($rule)) {
-            $param = isset($rule[1]) ? $rule[1] : null;
-            $rule  = $rule[0];
+            $param=isset($rule[1]) ? $rule[1] : null;
+            $rule=$rule[0];
         } else {
-            $param = null;
+            $param=null;
         }
         return false !== filter_var($value, is_int($rule) ? $rule : filter_id($rule), $param);
     }
@@ -881,7 +881,7 @@ 
      */
     protected function requireIf($value, $rule, $data)
     {
-        list($field, $val) = explode(',', $rule);
+        list($field, $val)=explode(',', $rule);
         if ($this->getDataValue($data, $field) == $val) {
             return !empty($value);
         } else {
@@ -899,7 +899,7 @@ 
      */
     protected function requireCallback($value, $rule, $data)
     {
-        $result = call_user_func_array($rule, [$value, $data]);
+        $result=call_user_func_array($rule, [$value, $data]);
         if ($result) {
             return !empty($value);
         } else {
@@ -917,7 +917,7 @@ 
      */
     protected function requireWith($value, $rule, $data)
     {
-        $val = $this->getDataValue($data, $rule);
+        $val=$this->getDataValue($data, $rule);
         if (!empty($val)) {
             return !empty($value);
         } else {
@@ -959,9 +959,9 @@ 
     protected function between($value, $rule)
     {
         if (is_string($rule)) {
-            $rule = explode(',', $rule);
+            $rule=explode(',', $rule);
         }
-        list($min, $max) = $rule;
+        list($min, $max)=$rule;
         return $value >= $min && $value <= $max;
     }
 
@@ -975,9 +975,9 @@ 
     protected function notBetween($value, $rule)
     {
         if (is_string($rule)) {
-            $rule = explode(',', $rule);
+            $rule=explode(',', $rule);
         }
-        list($min, $max) = $rule;
+        list($min, $max)=$rule;
         return $value < $min || $value > $max;
     }
 
@@ -991,16 +991,16 @@ 
     protected function length($value, $rule)
     {
         if (is_array($value)) {
-            $length = count($value);
+            $length=count($value);
         } elseif ($value instanceof File) {
-            $length = $value->getSize();
+            $length=$value->getSize();
         } else {
-            $length = mb_strlen((string) $value);
+            $length=mb_strlen((string) $value);
         }
 
         if (strpos($rule, ',')) {
             // 长度区间
-            list($min, $max) = explode(',', $rule);
+            list($min, $max)=explode(',', $rule);
             return $length >= $min && $length <= $max;
         } else {
             // 指定长度
@@ -1018,11 +1018,11 @@ 
     protected function max($value, $rule)
     {
         if (is_array($value)) {
-            $length = count($value);
+            $length=count($value);
         } elseif ($value instanceof File) {
-            $length = $value->getSize();
+            $length=$value->getSize();
         } else {
-            $length = mb_strlen((string) $value);
+            $length=mb_strlen((string) $value);
         }
         return $length <= $rule;
     }
@@ -1037,11 +1037,11 @@ 
     protected function min($value, $rule)
     {
         if (is_array($value)) {
-            $length = count($value);
+            $length=count($value);
         } elseif ($value instanceof File) {
-            $length = $value->getSize();
+            $length=$value->getSize();
         } else {
-            $length = mb_strlen((string) $value);
+            $length=mb_strlen((string) $value);
         }
         return $length >= $rule;
     }
@@ -1080,15 +1080,15 @@ 
     protected function expire($value, $rule)
     {
         if (is_string($rule)) {
-            $rule = explode(',', $rule);
+            $rule=explode(',', $rule);
         }
-        list($start, $end) = $rule;
+        list($start, $end)=$rule;
         if (!is_numeric($start)) {
-            $start = strtotime($start);
+            $start=strtotime($start);
         }
 
         if (!is_numeric($end)) {
-            $end = strtotime($end);
+            $end=strtotime($end);
         }
         return $_SERVER['REQUEST_TIME'] >= $start && $_SERVER['REQUEST_TIME'] <= $end;
     }
@@ -1127,11 +1127,11 @@ 
     protected function regex($value, $rule)
     {
         if (isset($this->regex[$rule])) {
-            $rule = $this->regex[$rule];
+            $rule=$this->regex[$rule];
         }
         if (0 !== strpos($rule, '/') && !preg_match('/\/[imsU]{0,4}$/', $rule)) {
             // 不是正则表达式则两端补上/
-            $rule = '/^' . $rule . '$/';
+            $rule='/^'.$rule.'$/';
         }
         return 1 === preg_match($rule, (string) $value);
     }
@@ -1146,7 +1146,7 @@ 
      */
     protected function token($value, $rule, $data)
     {
-        $rule = !empty($rule) ? $rule : '__token__';
+        $rule=!empty($rule) ? $rule : '__token__';
         if (!isset($data[$rule]) || !Session::has($rule)) {
             // 令牌数据无效
             return false;
@@ -1180,10 +1180,10 @@ 
     {
         if (strpos($key, '.')) {
             // 支持二维数组验证
-            list($name1, $name2) = explode('.', $key);
-            $value               = isset($data[$name1][$name2]) ? $data[$name1][$name2] : null;
+            list($name1, $name2)=explode('.', $key);
+            $value=isset($data[$name1][$name2]) ? $data[$name1][$name2] : null;
         } else {
-            $value = isset($data[$key]) ? $data[$key] : null;
+            $value=isset($data[$key]) ? $data[$key] : null;
         }
         return $value;
     }
@@ -1199,30 +1199,30 @@ 
      */
     protected function getRuleMsg($attribute, $title, $type, $rule)
     {
-        if (isset($this->message[$attribute . '.' . $type])) {
-            $msg = $this->message[$attribute . '.' . $type];
+        if (isset($this->message[$attribute.'.'.$type])) {
+            $msg=$this->message[$attribute.'.'.$type];
         } elseif (isset($this->message[$attribute][$type])) {
-            $msg = $this->message[$attribute][$type];
+            $msg=$this->message[$attribute][$type];
         } elseif (isset($this->message[$attribute])) {
-            $msg = $this->message[$attribute];
+            $msg=$this->message[$attribute];
         } elseif (isset(self::$typeMsg[$type])) {
-            $msg = self::$typeMsg[$type];
+            $msg=self::$typeMsg[$type];
         } else {
-            $msg = $title . '规则错误';
+            $msg=$title.'规则错误';
         }
 
         if (is_string($msg) && 0 === strpos($msg, '{%')) {
-            $msg = Lang::get(substr($msg, 2, -1));
+            $msg=Lang::get(substr($msg, 2, -1));
         }
 
         if (is_string($msg) && is_scalar($rule) && false !== strpos($msg, ':')) {
             // 变量替换
             if (is_string($rule) && strpos($rule, ',')) {
-                $array = array_pad(explode(',', $rule), 3, '');
+                $array=array_pad(explode(',', $rule), 3, '');
             } else {
-                $array = array_pad([], 3, '');
+                $array=array_pad([], 3, '');
             }
-            $msg = str_replace(
+            $msg=str_replace(
                 [':attribute', ':rule', ':1', ':2', ':3'],
                 [$title, (string) $rule, $array[0], $array[1], $array[2]],
                 $msg);
@@ -1236,32 +1236,32 @@ 
      * @param string $scene  验证场景
      * @return array
      */
-    protected function getScene($scene = '')
+    protected function getScene($scene='')
     {
         if (empty($scene)) {
             // 读取指定场景
-            $scene = $this->currentScene;
+            $scene=$this->currentScene;
         }
 
         if (!empty($scene) && isset($this->scene[$scene])) {
             // 如果设置了验证适用场景
-            $scene = $this->scene[$scene];
+            $scene=$this->scene[$scene];
             if (is_string($scene)) {
-                $scene = explode(',', $scene);
+                $scene=explode(',', $scene);
             }
         } else {
-            $scene = [];
+            $scene=[];
         }
         return $scene;
     }
 
     public static function __callStatic($method, $params)
     {
-        $class = self::make();
+        $class=self::make();
         if (method_exists($class, $method)) {
             return call_user_func_array([$class, $method], $params);
         } else {
-            throw new \Exception('method not exists:' . __CLASS__ . '->' . $method);
+            throw new \Exception('method not exists:'.__CLASS__.'->'.$method);
         }
     }
 }
\ No newline at end of file

core/helpers/PinYin.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 namespace puck\helpers;
 
 use Overtrue\Pinyin\Pinyin as VendorPinyin;
-class PinYin extends VendorPinyin{
+class PinYin extends VendorPinyin {
 
     public function noun($str) {
         $pinyinArr=$this->convert($str);
@@ -17,6 +17,6 @@ 
             //首字母转大写
             $pinyin[0]=strtoupper($pinyin[0]);
         }
-        return implode('',$pinyinArr);
+        return implode('', $pinyinArr);
     }
 }
\ No newline at end of file

core/Conf.php

Spacing +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
 
 class Conf {
     static $config=false;
-    static public function load(){
-        if(!self::$config){
+    static public function load() {
+        if (!self::$config) {
             self::$config=Config::load(BASE_PATH.'/app/conf');
         }
         return self::$config;

core/Mysql.php

Spacing +3 added lines, -3 removed lines

@@ -9,11 +9,11 @@
 namespace puck;
 
 
-class Mysql extends \MysqliDb{
+class Mysql extends \MysqliDb {
 
-    static public function getDb($db){
+    static public function getDb($db) {
         static $dbList;
-        if(!isset($dbList[$db])){
+        if (!isset($dbList[$db])) {
             $dbList[$db]=new \MysqliDb(config('db.'.$db));
         }
         return $dbList[$db];

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;

Spacing +26 added lines, -26 removed lines

@@ -15,60 +15,60 @@
     protected $limitCount=null;
     public function __construct()
     {
-        if(!$this->dbConn){
+        if (!$this->dbConn) {
             $this->dbConn='main';
         }
-        $this->db = Mysql::getDb($this->dbConn);
+        $this->db=Mysql::getDb($this->dbConn);
     }
-    public function __call($method,$arg){
+    public function __call($method, $arg) {
         $ret=$this;
-        if(method_exists ($this->db, $method)){
-            $ret=call_user_func_array(array($this->db,$method),$arg);
+        if (method_exists($this->db, $method)) {
+            $ret=call_user_func_array(array($this->db, $method), $arg);
         }
-        return $ret==$this->db? $this: $ret;
+        return $ret == $this->db ? $this : $ret;
     }
-    public function __get($name){
-        if(property_exists($this->db, $name)){
+    public function __get($name) {
+        if (property_exists($this->db, $name)) {
             return $this->db->$name;
         }
-        throw new MemberAccessException('model Property ' . $name . ' not exists');
+        throw new MemberAccessException('model Property '.$name.' not exists');
     }
-    public function limit($limit){
+    public function limit($limit) {
         $this->limitCount=$limit;
         return $this;
     }
-    public function find(){
-        return $this->db->getOne($this->table,$this->field);
+    public function find() {
+        return $this->db->getOne($this->table, $this->field);
     }
-    public function select(){
-        return $this->db->get($this->table,$this->limitCount?$this->limitCount:null,$this->field);
+    public function select() {
+        return $this->db->get($this->table, $this->limitCount ? $this->limitCount : null, $this->field);
     }
-    public function count(){
+    public function count() {
         return $this->field("count(*) as count")->find()['count'];
     }
-    public function table($table){
+    public function table($table) {
         $this->table=$table;
         return $this;
     }
-    public function add($data){
-        return $this->db->insert($this->table,$data);
+    public function add($data) {
+        return $this->db->insert($this->table, $data);
     }
-    public function replace($data){
-        return $this->db->replace($this->table,$data);
+    public function replace($data) {
+        return $this->db->replace($this->table, $data);
     }
-    public function update($data){
-        return $this->db->update($this->table,$data);
+    public function update($data) {
+        return $this->db->update($this->table, $data);
     }
-    public function field($field){
+    public function field($field) {
         $this->field=$field;
         return $this;
     }
-    public function delete(){
+    public function delete() {
         return $this->db->delete($this->table);
     }
-    public function page($page,$pageLimit='10'){
+    public function page($page, $pageLimit='10') {
         $this->db->pageLimit=$pageLimit;
-        $info= $this->db->paginate($this->table,$page,$this->field);
+        $info=$this->db->paginate($this->table, $page, $this->field);
         return $info;
     }
 }
\ No newline at end of file

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();

Spacing +61 added lines, -61 removed lines

@@ -10,15 +10,15 @@ 
 class TimeAgo
 {
     // defines the number of seconds per "unit"
-    private $secondsPerMinute = 60;
-    private $secondsPerHour = 3600;
-    private $secondsPerDay = 86400;
-    private $secondsPerMonth = 2592000;
-    private $secondsPerYear = 31536000; // 31622400 seconds on leap years though...
+    private $secondsPerMinute=60;
+    private $secondsPerHour=3600;
+    private $secondsPerDay=86400;
+    private $secondsPerMonth=2592000;
+    private $secondsPerYear=31536000; // 31622400 seconds on leap years though...
     private $timezone;
     private $previousTimezone;
 
-    private static $timeAgoStrings = array(
+    private static $timeAgoStrings=array(
         'aboutOneDay' => "1 天前",
         'aboutOneHour' => "大约 1 小时前",
         'aboutOneMonth' => "大约 1 个月前",
@@ -36,9 +36,9 @@ 
      * TimeAgo constructor.
      * @param null|DateTimeZone $timezone the timezone to use (uses system if none is given)
      */
-    public function __construct($timezone = null)
+    public function __construct($timezone=null)
     {
-        $this->timezone = $timezone;
+        $this->timezone=$timezone;
         // sets the default timezone
         $this->changeTimezone();
     }
@@ -50,84 +50,84 @@ 
         $this->restoreTimezone();
     }
 
-    public function inStamp($past, $now = null) {
-        if($now==null){
+    public function inStamp($past, $now=null) {
+        if ($now == null) {
             $now=time();
         }
         // creates the "time ago" string. This always starts with an "about..."
-        $timeAgo = "";
+        $timeAgo="";
 
         // finds the time difference
-        $timeDifference = $now - $past;
+        $timeDifference=$now - $past;
         // rule 0
         // $past is null or empty or ''
-        if ($past==0) {
-            $timeAgo = $this->translate('never');
+        if ($past == 0) {
+            $timeAgo=$this->translate('never');
         }
         // rule 1
         // less than 29secs
         else if ($this->isLessThan29Seconds($timeDifference)) {
-            $timeAgo = $this->translate('lessThanAMinute');
+            $timeAgo=$this->translate('lessThanAMinute');
         }
         // rule 2
         // more than 29secs and less than 1min29secss
         else if ($this->isLessThan1Min29Seconds($timeDifference)) {
-            $timeAgo = $this->translate('oneMinute');
+            $timeAgo=$this->translate('oneMinute');
         }
         // rule 3
         // between 1min30secs and 44mins29secs
         else if ($this->isLessThan44Min29Secs($timeDifference)) {
-            $minutes = round($timeDifference / $this->secondsPerMinute);
-            $timeAgo = $this->translate('lessThanOneHour', $minutes);
+            $minutes=round($timeDifference / $this->secondsPerMinute);
+            $timeAgo=$this->translate('lessThanOneHour', $minutes);
         }
         // rule 4
         // between 44mins30secs and 1hour29mins59secs
         else if ($this->isLessThan1Hour29Mins59Seconds($timeDifference)) {
-            $timeAgo = $this->translate('aboutOneHour');
+            $timeAgo=$this->translate('aboutOneHour');
         }
         // rule 5
         // between 1hour29mins59secs and 23hours59mins29secs
         else if ($this->isLessThan23Hours59Mins29Seconds($timeDifference)) {
-            $hours = round($timeDifference / $this->secondsPerHour);
-            $timeAgo = $this->translate('hours', $hours);
+            $hours=round($timeDifference / $this->secondsPerHour);
+            $timeAgo=$this->translate('hours', $hours);
         }
         // rule 6
         // between 23hours59mins30secs and 47hours59mins29secs
         else if ($this->isLessThan47Hours59Mins29Seconds($timeDifference)) {
-            $timeAgo = $this->translate('aboutOneDay');
+            $timeAgo=$this->translate('aboutOneDay');
         }
         // rule 7
         // between 47hours59mins30secs and 29days23hours59mins29secs
         else if ($this->isLessThan29Days23Hours59Mins29Seconds($timeDifference)) {
-            $days = round($timeDifference / $this->secondsPerDay);
-            $timeAgo = $this->translate('days', $days);
+            $days=round($timeDifference / $this->secondsPerDay);
+            $timeAgo=$this->translate('days', $days);
         }
         // rule 8
         // between 29days23hours59mins30secs and 59days23hours59mins29secs
         else if ($this->isLessThan59Days23Hours59Mins29Secs($timeDifference)) {
-            $timeAgo = $this->translate('aboutOneMonth');
+            $timeAgo=$this->translate('aboutOneMonth');
         }
         // rule 9
         // between 59days23hours59mins30secs and 1year (minus 1sec)
         else if ($this->isLessThan1Year($timeDifference)) {
-            $months = round($timeDifference / $this->secondsPerMonth);
+            $months=round($timeDifference / $this->secondsPerMonth);
             // if months is 1, then set it to 2, because we are "past" 1 month
             if ($months == 1) {
-                $months = 2;
+                $months=2;
             }
 
-            $timeAgo = $this->translate('months', $months);
+            $timeAgo=$this->translate('months', $months);
         }
         // rule 10
         // between 1year and 2years (minus 1sec)
         else if ($this->isLessThan2Years($timeDifference)) {
-            $timeAgo = $this->translate('aboutOneYear');
+            $timeAgo=$this->translate('aboutOneYear');
         }
         // rule 11
         // 2years or more
         else {
-            $years = floor($timeDifference / $this->secondsPerYear);
-            $timeAgo = $this->translate('years', $years);
+            $years=floor($timeDifference / $this->secondsPerYear);
+            $timeAgo=$this->translate('years', $years);
         }
 
         return $timeAgo;
@@ -139,18 +139,18 @@ 
      * @param string $now the current time, defaults to now (can be an other time though)
      * @return string the difference in spoken format, e.g. 1 day ago
      */
-    public function inWords($past, $now = "now")
+    public function inWords($past, $now="now")
     {
 
         // finds the past in datetime
-        $past = strtotime($past);
+        $past=strtotime($past);
         // finds the current datetime
-        $now = strtotime($now);
+        $now=strtotime($now);
         if ($this->isPastEmpty($past)) {
             $past=0;
             $past=0;
         }
-        return $this->inStamp($past,$now);
+        return $this->inStamp($past, $now);
     }
 
     /**
@@ -161,23 +161,23 @@ 
      * @param string $now the "now" time to parse
      * @return array the difference in dates, using the two dates
      */
-    public function dateDifference($past, $now = "now")
+    public function dateDifference($past, $now="now")
     {
         // initializes the placeholders for the different "times"
-        $seconds = 0;
-        $minutes = 0;
-        $hours = 0;
-        $days = 0;
-        $months = 0;
-        $years = 0;
+        $seconds=0;
+        $minutes=0;
+        $hours=0;
+        $days=0;
+        $months=0;
+        $years=0;
 
         // finds the past in datetime
-        $past = strtotime($past);
+        $past=strtotime($past);
         // finds the current datetime
-        $now = strtotime($now);
+        $now=strtotime($now);
 
         // calculates the difference
-        $timeDifference = $now - $past;
+        $timeDifference=$now - $past;
 
         // starts determining the time difference
         if ($timeDifference >= 0) {
@@ -185,46 +185,46 @@ 
                 // finds the number of years
                 case ($timeDifference >= $this->secondsPerYear):
                     // uses floor to remove decimals
-                    $years = floor($timeDifference / $this->secondsPerYear);
+                    $years=floor($timeDifference / $this->secondsPerYear);
                     // saves the amount of seconds left
-                    $timeDifference = $timeDifference - ($years * $this->secondsPerYear);
+                    $timeDifference=$timeDifference - ($years * $this->secondsPerYear);
 
                 // finds the number of months
                 case ($timeDifference >= $this->secondsPerMonth && $timeDifference <= ($this->secondsPerYear - 1)):
                     // uses floor to remove decimals
-                    $months = floor($timeDifference / $this->secondsPerMonth);
+                    $months=floor($timeDifference / $this->secondsPerMonth);
                     // saves the amount of seconds left
-                    $timeDifference = $timeDifference - ($months * $this->secondsPerMonth);
+                    $timeDifference=$timeDifference - ($months * $this->secondsPerMonth);
 
                 // finds the number of days
                 case ($timeDifference >= $this->secondsPerDay && $timeDifference <= ($this->secondsPerYear - 1)):
                     // uses floor to remove decimals
-                    $days = floor($timeDifference / $this->secondsPerDay);
+                    $days=floor($timeDifference / $this->secondsPerDay);
                     // saves the amount of seconds left
-                    $timeDifference = $timeDifference - ($days * $this->secondsPerDay);
+                    $timeDifference=$timeDifference - ($days * $this->secondsPerDay);
 
                 // finds the number of hours
                 case ($timeDifference >= $this->secondsPerHour && $timeDifference <= ($this->secondsPerDay - 1)):
                     // uses floor to remove decimals
-                    $hours = floor($timeDifference / $this->secondsPerHour);
+                    $hours=floor($timeDifference / $this->secondsPerHour);
                     // saves the amount of seconds left
-                    $timeDifference = $timeDifference - ($hours * $this->secondsPerHour);
+                    $timeDifference=$timeDifference - ($hours * $this->secondsPerHour);
 
                 // finds the number of minutes
                 case ($timeDifference >= $this->secondsPerMinute && $timeDifference <= ($this->secondsPerHour - 1)):
                     // uses floor to remove decimals
-                    $minutes = floor($timeDifference / $this->secondsPerMinute);
+                    $minutes=floor($timeDifference / $this->secondsPerMinute);
                     // saves the amount of seconds left
-                    $timeDifference = $timeDifference - ($minutes * $this->secondsPerMinute);
+                    $timeDifference=$timeDifference - ($minutes * $this->secondsPerMinute);
 
                 // finds the number of seconds
                 case ($timeDifference <= ($this->secondsPerMinute - 1)):
                     // seconds is just what there is in the timeDifference variable
-                    $seconds = $timeDifference;
+                    $seconds=$timeDifference;
             }
         }
 
-        $difference = [
+        $difference=[
             "years" => $years,
             "months" => $months,
             "days" => $days,
@@ -242,7 +242,7 @@ 
      * @param string $time the time to add to the translated text.
      * @return string the translated label text including the time.
      */
-    protected function translate($label, $time = '')
+    protected function translate($label, $time='')
     {
         // handles a usecase introduced in #18, where a new translation was added.
         // This would cause an array-out-of-bound exception, since the index does not
@@ -260,9 +260,9 @@ 
      */
     protected function changeTimezone()
     {
-        $this->previousTimezone = false;
+        $this->previousTimezone=false;
         if ($this->timezone) {
-            $this->previousTimezone = date_default_timezone_get();
+            $this->previousTimezone=date_default_timezone_get();
             date_default_timezone_set($this->timezone);
         }
     }
@@ -274,7 +274,7 @@ 
     {
         if ($this->previousTimezone) {
             date_default_timezone_set($this->previousTimezone);
-            $this->previousTimezone = false;
+            $this->previousTimezone=false;
         }
     }