Merge branch 'master' of https://github.com/liu21st/think

library/think/behavior.php

@@ -19,7 +19,7 @@ namespace think;
 abstract class Behavior {
 
     // 行为参数 和配置参数设置相同
-    protected $options =  array();
+    protected $options = [];
 
    /**
      * 架构函数

library/think/cookie.php

@@ -124,7 +124,8 @@ class Cookie
         $prefix = $prefix ? $prefix : $config['prefix'];
         $name   = $prefix . $name;
         setcookie($name, '', time() - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
-        unset($_COOKIE[$name]); // 删除指定cookie
+        // 删除指定cookie
+        unset($_COOKIE[$name]);
     }
 
     /**
@@ -143,7 +144,7 @@ class Cookie
         $config = self::$config;
         $prefix = $prefix ? $prefix : $config['prefix'];
         if ($prefix) {
-// 如果前缀为空字符串将不作处理直接返回
+            // 如果前缀为空字符串将不作处理直接返回
             foreach ($_COOKIE as $key => $val) {
                 if (0 === strpos($key, $prefix)) {
                     setcookie($key, '', time() - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']);

library/think/error.php

@@ -20,11 +20,13 @@ class Error
      */
     public static function appException($e)
     {
-        $error['message'] = $e->getMessage();
-        $error['file']    = $e->getFile();
-        $error['line']    = $e->getLine();
-        $error['trace']   = $e->getTraceAsString();
-        $error['code']    = $e->getCode();
+        $error = [
+            'message'   => $e->getMessage(),
+            'file'      => $e->getFile(),
+            'line'      => $e->getLine(),
+            'trace'     => $e->getTraceAsString(),
+            'code'      => $e->getCode(),
+        ];
         // 记录异常日志
         Log::record($error['message'], 'ERR');
         // 发送404信息
@@ -98,9 +100,11 @@ class Error
             exit($message);
         } elseif (IS_API) {
             // API接口
-            $data['code'] = $code;
-            $data['msg']  = $message;
-            $data['time'] = NOW_TIME;
+            $data = [
+                'code'  => $code,
+                'msg'   => $message,
+                'time'  => NOW_TIME,
+            ];
             Response::returnData($data);
             exit();
         }

library/think/model/adv.php

@@ -11,13 +11,11 @@
 
 namespace think\model;
 
-use traits\think\model\extend;
-use traits\think\model\query;
-
-T('think/model/extend');
+T('think/model/adv');
 T('think/model/query');
 
-class ExtendModel extends \think\model
+class Adv extends \think\model
 {
-    use extend, query;
+    use traits\think\model\adv;
+    use traits\think\model\query;
 }

library/think/model/mongo.php

@@ -17,7 +17,7 @@ use think\Loader;
  * MongoModel模型类
  * 实现了ODM和ActiveRecords模式
  */
-class MongoModel extends \Think\Model
+class Mongo extends \Think\Model
 {
     // 主键类型
     const TYPE_OBJECT = 1;

library/think/model/relation.php

@@ -12,7 +12,7 @@
 namespace think\model;
 
 T('think/model/relation');
-class RelationModel extends \think\model
+class Relation extends \think\model
 {
     use \traits\think\model\relation;
 }

library/think/model/view.php

@@ -12,7 +12,7 @@
 namespace think\model;
 
 T('think/model/view');
-class ViewModel extends \think\model
+class View extends \think\model
 {
     use \traits\think\model\view;
 }

library/think/response.php

@@ -69,10 +69,12 @@ class Response
      */
     public static function result($data, $code = 0, $msg = '', $type = '')
     {
-        $result['code'] = $code;
-        $result['msg']  = $msg;
-        $result['time'] = NOW_TIME;
-        $result['data'] = $data;
+        $result = [
+            'code'  => $code, 
+            'msg'   => $msg, 
+            'time'  => NOW_TIME, 
+            'data'  => $data
+        ];
         self::returnData($result, $type);
     }