mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-03 14:02:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

提升Model类单元测试覆盖率

Browse Source
This commit is contained in:
oldrind
2016-03-04 22:08:39 +08:00
parent 09def34250
commit 5bac45f59b
2 changed files with 182 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Model.php
View File

@@ -990,6 +990,8 @@ class Model
*/
protected function dataValidate(&$data)
{
// 验证前清空error
$this->error = '';
if (!empty($this->options['validate'])) {
// 获取自动验证规则
list($rules, $options, $scene) = $this->getDataRule($this->options['validate'], 'validate');
@@ -1938,11 +1940,10 @@ class Model
*/
public function order($field, $order = null)
{
if (is_string($field) && !empty($field) && is_null($order)) {
$this->options['order'][] = $field;
} elseif (is_string($field) && !empty($field) && is_string($order)) {
$this->options['order'][$field] = $order;
} elseif (is_array($field) && !empty($field)) {
if (!empty($field)) {
if (!is_array($field)) {
$field = empty($order) ? [$field] : [(string) $field => (string) $order];
}
$this->options['order'] = $field;
}
return $this;