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

PSR规范调整

Browse Source
This commit is contained in:
thinkphp
2015-10-04 13:05:15 +08:00
parent 1cfb3704c6
commit 27e724bb3c
135 changed files with 9426 additions and 11556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/model/extend_model.php
View File

@@ -10,12 +10,14 @@
// +----------------------------------------------------------------------
namespace think\model;
use traits\think\model\extend,
traits\think\model\query;
use traits\think\model\extend;
use traits\think\model\query;
T('think/model/extend');
T('think/model/query');
class ExtendModel extends \think\model {
class ExtendModel extends \think\model
{
use extend, query;
}
}

220
library/think/model/mongo_model.php
View File

@@ -9,26 +9,29 @@
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
namespace think\model;
use think\Lang;
use think\Loader;
/**
* MongoModel模型类
* 实现了ODM和ActiveRecords模式
*/
class MongoModel extends \Think\Model{
class MongoModel extends \Think\Model
{
// 主键类型
const TYPE_OBJECT = 1;
const TYPE_INT = 2;
const TYPE_STRING = 3;
const TYPE_OBJECT = 1;
const TYPE_INT = 2;
const TYPE_STRING = 3;
// 主键名称
protected $pk = '_id';
protected $pk = '_id';
// _id 类型 1 Object 采用MongoId对象 2 Int 整形 支持自动增长 3 String 字符串Hash
protected $_idType = self::TYPE_OBJECT;
protected $_idType = self::TYPE_OBJECT;
// 主键是否自动增长 支持Int型主键
protected $_autoInc = false;
protected $_autoInc = false;
// Mongo默认关闭字段检测 可以动态追加字段
protected $autoCheckFields = false;
protected $autoCheckFields = false;
/**
* 利用__call方法实现一些特殊的Model方法
@@ -37,30 +40,32 @@ class MongoModel extends \Think\Model{
* @param array $args 调用参数
* @return mixed
*/
public function __call($method,$args) {
if(strtolower(substr($method,0,5))=='getby') {
public function __call($method, $args)
{
if (strtolower(substr($method, 0, 5)) == 'getby') {
// 根据某个字段获取记录
$field = Loader::parseName(substr($method,5));
$where[$field] =$args[0];
$field = Loader::parseName(substr($method, 5));
$where[$field] = $args[0];
return $this->where($where)->find();
}elseif(strtolower(substr($method,0,10))=='getfieldby') {
} elseif (strtolower(substr($method, 0, 10)) == 'getfieldby') {
// 根据某个字段获取记录的某个值
$name = Loader::parseName(substr($method,10));
$where[$name] =$args[0];
$name = Loader::parseName(substr($method, 10));
$where[$name] = $args[0];
return $this->where($where)->getField($args[1]);
}else{
throw new \think\Exception(__CLASS__.':'.$method.Lang::get('_METHOD_NOT_EXIST_'));
} else {
throw new \think\Exception(__CLASS__ . ':' . $method . Lang::get('_METHOD_NOT_EXIST_'));
return;
}
}
// 写入数据前的回调方法 包括新增和更新
protected function _before_write(&$data) {
$pk = $this->getPk();
protected function _before_write(&$data)
{
$pk = $this->getPk();
// 根据主键类型处理主键数据
if(isset($data[$pk]) && $this->_idType == self::TYPE_OBJECT) {
$data[$pk] = new MongoId($data[$pk]);
}
if (isset($data[$pk]) && self::TYPE_OBJECT == $this->_idType) {
$data[$pk] = new MongoId($data[$pk]);
}
}
/**
@@ -68,9 +73,10 @@ class MongoModel extends \Think\Model{
* @access public
* @return integer
*/
public function count(){
public function count()
{
// 分析表达式
$options = $this->_parseOptions();
$options = $this->_parseOptions();
return $this->db->count($options);
}
@@ -80,31 +86,36 @@ class MongoModel extends \Think\Model{
* @param string $pk 字段名 默认为主键
* @return mixed
*/
public function getMongoNextId($pk=''){
if(empty($pk)) {
$pk = $this->getPk();
public function getMongoNextId($pk = '')
{
if (empty($pk)) {
$pk = $this->getPk();
}
return $this->db->getMongoNextId($pk);
}
// 插入数据前的回调方法
protected function _before_insert(&$data,$options) {
protected function _before_insert(&$data, $options)
{
// 写入数据到数据库
if($this->_autoInc && $this->_idType== self::TYPE_INT) { // 主键自动增长
$pk = $this->getPk();
if(!isset($data[$pk])) {
$data[$pk] = $this->db->mongo_next_id($pk);
if ($this->_autoInc && self::TYPE_INT == $this->_idType) {
// 主键自动增长
$pk = $this->getPk();
if (!isset($data[$pk])) {
$data[$pk] = $this->db->mongo_next_id($pk);
}
}
}
public function clear(){
public function clear()
{
return $this->db->clear();
}
// 查询成功后的回调方法
protected function _after_select(&$resultSet,$options) {
array_walk($resultSet,[$this,'checkMongoId']);
protected function _after_select(&$resultSet, $options)
{
array_walk($resultSet, [$this, 'checkMongoId']);
}
/**
@@ -113,17 +124,19 @@ class MongoModel extends \Think\Model{
* @param array $result 返回数据
* @return array
*/
protected function checkMongoId(&$result){
if(is_object($result['_id'])) {
protected function checkMongoId(&$result)
{
if (is_object($result['_id'])) {
$result['_id'] = $result['_id']->__toString();
}
return $result;
}
// 表达式过滤回调方法
protected function _options_filter(&$options) {
protected function _options_filter(&$options)
{
$id = $this->getPk();
if(isset($options['where'][$id]) && is_scalar($options['where'][$id]) && $this->_idType== self::TYPE_OBJECT) {
if (isset($options['where'][$id]) && is_scalar($options['where'][$id]) && self::TYPE_OBJECT == $this->_idType) {
$options['where'][$id] = new MongoId($options['where'][$id]);
}
}
@@ -134,28 +147,30 @@ class MongoModel extends \Think\Model{
* @param mixed $options 表达式参数
* @return mixed
*/
public function find($options=[]) {
if( is_numeric($options) || is_string($options)) {
$id = $this->getPk();
$where[$id] = $options;
$options = [];
public function find($options = [])
{
if (is_numeric($options) || is_string($options)) {
$id = $this->getPk();
$where[$id] = $options;
$options = [];
$options['where'] = $where;
}
}
// 分析表达式
$options = $this->_parseOptions($options);
$result = $this->db->find($options);
if(false === $result) {
$options = $this->_parseOptions($options);
$result = $this->db->find($options);
if (false === $result) {
return false;
}
if(empty($result)) {// 查询结果为空
if (empty($result)) {
// 查询结果为空
return null;
}else{
} else {
$this->checkMongoId($result);
}
$this->data = $result;
$this->_after_find($this->data,$options);
$this->_after_find($this->data, $options);
return $this->data;
}
}
/**
* 字段值增长
@@ -164,8 +179,9 @@ class MongoModel extends \Think\Model{
* @param integer $step 增长值
* @return boolean
*/
public function setInc($field,$step=1) {
return $this->setField($field,['inc',$step]);
public function setInc($field, $step = 1)
{
return $this->setField($field, ['inc', $step]);
}
/**
@@ -175,8 +191,9 @@ class MongoModel extends \Think\Model{
* @param integer $step 减少值
* @return boolean
*/
public function setDec($field,$step=1) {
return $this->setField($field,['inc','-'.$step]);
public function setDec($field, $step = 1)
{
return $this->setField($field, ['inc', '-' . $step]);
}
/**
@@ -186,42 +203,49 @@ class MongoModel extends \Think\Model{
* @param string $spea 字段数据间隔符号
* @return mixed
*/
public function getField($field,$sepa=null) {
$options['field'] = $field;
$options = $this->_parseOptions($options);
if(strpos($field,',')) { // 多字段
if(is_numeric($sepa)) {// 限定数量
$options['limit'] = $sepa;
$sepa = null;// 重置为null 返回数组
public function getField($field, $sepa = null)
{
$options['field'] = $field;
$options = $this->_parseOptions($options);
if (strpos($field, ',')) {
// 多字段
if (is_numeric($sepa)) {
// 限定数量
$options['limit'] = $sepa;
$sepa = null; // 重置为null 返回数组
}
$resultSet = $this->db->select($options);
if(!empty($resultSet)) {
$_field = explode(',', $field);
$field = array_keys($resultSet[0]);
$key = array_shift($field);
$key2 = array_shift($field);
$cols = [];
$count = count($_field);
foreach ($resultSet as $result){
$name = $result[$key];
if(2==$count) {
$cols[$name] = $result[$key2];
}else{
$cols[$name] = is_null($sepa)?$result:implode($sepa,$result);
if (!empty($resultSet)) {
$_field = explode(',', $field);
$field = array_keys($resultSet[0]);
$key = array_shift($field);
$key2 = array_shift($field);
$cols = [];
$count = count($_field);
foreach ($resultSet as $result) {
$name = $result[$key];
if (2 == $count) {
$cols[$name] = $result[$key2];
} else {
$cols[$name] = is_null($sepa) ? $result : implode($sepa, $result);
}
}
return $cols;
}
}else{
} else {
// 返回数据个数
if(true !== $sepa) {// 当sepa指定为true的时候 返回所有数据
$options['limit'] = is_numeric($sepa)?$sepa:1;
} // 查找一条记录
if (true !== $sepa) {
// 当sepa指定为true的时候 返回所有数据
$options['limit'] = is_numeric($sepa) ? $sepa : 1;
} // 查找一条记录
$result = $this->db->find($options);
if(!empty($result)) {
if(1==$options['limit']) return reset($result[0]);
foreach ($result as $val){
$array[] = $val[$field];
if (!empty($result)) {
if (1 == $options['limit']) {
return reset($result[0]);
}
foreach ($result as $val) {
$array[] = $val[$field];
}
return $array;
}
@@ -235,7 +259,8 @@ class MongoModel extends \Think\Model{
* @param array $command 指令
* @return mixed
*/
public function command($command) {
public function command($command)
{
return $this->db->command($command);
}
@@ -246,14 +271,16 @@ class MongoModel extends \Think\Model{
* @param array $args 参数
* @return mixed
*/
public function mongoCode($code,$args=[]) {
return $this->db->execute($code,$args);
public function mongoCode($code, $args = [])
{
return $this->db->execute($code, $args);
}
// 数据库切换后回调方法
protected function _after_db() {
protected function _after_db()
{
// 切换Collection
$this->db->switchCollection($this->getTableName(),$this->dbName);
$this->db->switchCollection($this->getTableName(), $this->dbName);
}
/**
@@ -261,16 +288,17 @@ class MongoModel extends \Think\Model{
* @access public
* @return string
*/
public function getTableName() {
if(empty($this->trueTableName)) {
$tableName = !empty($this->tablePrefix) ? $this->tablePrefix : '';
if(!empty($this->tableName)) {
public function getTableName()
{
if (empty($this->trueTableName)) {
$tableName = !empty($this->tablePrefix) ? $this->tablePrefix : '';
if (!empty($this->tableName)) {
$tableName .= $this->tableName;
}else{
} else {
$tableName .= Loader::parseName($this->name);
}
$this->trueTableName = strtolower($tableName);
$this->trueTableName = strtolower($tableName);
}
return $this->trueTableName;
}
}
}

5
library/think/model/relation_model.php
View File

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

5
library/think/model/view_model.php
View File

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