modified 升级ThinkPHP版本至5.0.23

Author: zhaoxiang

thinkphp/.gitignore

@@ -9,7 +9,7 @@
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 
-define('THINK_VERSION', '5.0.19');
+define('THINK_VERSION', '5.0.23');
 define('THINK_START_TIME', microtime(true));
 define('THINK_START_MEM', memory_get_usage());
 define('EXT', '.php');

thinkphp/.htaccess

@@ -48,6 +48,7 @@
     'KVDB init error'                                           => '没有初始化KVDB，请在SAE管理平台初始化KVDB服务',
     'fields not exists'                                         => '数据表字段不存在',
     'where express error'                                       => '查询表达式错误',
+    'not support data'                                          => '不支持的数据表达式',
     'no data to update'                                         => '没有任何数据需要更新',
     'miss data to insert'                                       => '缺少需要写入的数据',
     'miss complex primary data'                                 => '缺少复合主键数据',

thinkphp/.travis.yml

@@ -551,6 +551,11 @@ public static function module($result, $config, $convert = null)
 
         // 获取控制器名
         $controller = strip_tags($result[1] ?: $config['default_controller']);
+
+        if (!preg_match('/^[A-Za-z](\w|\.)*$/', $controller)) {
+            throw new HttpException(404, 'controller not exists:' . $controller);
+        }
+
         $controller = $convert ? strtolower($controller) : $controller;
 
         // 获取操作名

thinkphp/base.php

@@ -176,7 +176,7 @@ public static function save()
             }
         }
 
-        if ($result = self::$driver->save($log)) {
+        if ($result = self::$driver->save($log, true)) {
             self::$log = [];
         }
 
@@ -211,7 +211,7 @@ public static function write($msg, $type = 'log', $force = false)
         is_null(self::$driver) && self::init(Config::get('log'));
 
         // 写入日志
-        if ($result = self::$driver->save($log)) {
+        if ($result = self::$driver->save($log, false)) {
             self::$log = [];
         }
 

thinkphp/lang/zh-cn.php

@@ -94,6 +94,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
     protected $type = [];
     // 是否为更新数据
     protected $isUpdate = false;
+    // 是否使用Replace
+    protected $replace = false;
     // 是否强制更新所有数据
     protected $force = false;
     // 更新条件
@@ -1013,6 +1015,18 @@ protected function isPk($key)
         return false;
     }
 
+    /**
+     * 新增数据是否使用Replace
+     * @access public
+     * @param  bool $replace
+     * @return $this
+     */
+    public function replace($replace = true)
+    {
+        $this->replace = $replace;
+        return $this;
+    }
+
     /**
      * 保存当前数据对象
      * @access public
@@ -1028,19 +1042,19 @@ public function save($data = [], $where = [], $sequence = null)
             $data     = [];
         }
 
-        if (!empty($data)) {
-            // 数据自动验证
-            if (!$this->validateData($data)) {
-                return false;
-            }
-            // 数据对象赋值
-            foreach ($data as $key => $value) {
-                $this->setAttr($key, $value, $data);
-            }
-            if (!empty($where)) {
-                $this->isUpdate    = true;
-                $this->updateWhere = $where;
-            }
+        // 数据自动验证
+        if (!$this->validateData($data)) {
+            return false;
+        }
+
+        // 数据对象赋值
+        foreach ($data as $key => $value) {
+            $this->setAttr($key, $value, $data);
+        }
+        
+        if (!empty($where)) {
+            $this->isUpdate    = true;
+            $this->updateWhere = $where;
         }
 
         // 自动关联写入
@@ -1163,9 +1177,9 @@ public function save($data = [], $where = [], $sequence = null)
             // 检测字段
             $allowFields = $this->checkAllowField(array_merge($this->auto, $this->insert));
             if (!empty($allowFields)) {
-                $result = $this->getQuery()->strict(false)->field($allowFields)->insert($this->data, false, false, $sequence);
+                $result = $this->getQuery()->strict(false)->field($allowFields)->insert($this->data, $this->replace, false, $sequence);
             } else {
-                $result = $this->getQuery()->insert($this->data, false, false, $sequence);
+                $result = $this->getQuery()->insert($this->data, $this->replace, false, $sequence);
             }
 
             // 获取自动增长主键