PSR规范调整

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

View File

@@ -11,46 +11,49 @@
namespace traits\think\model;
trait View {
protected $viewFields = [];
trait View
{
protected $viewFields = [];
/**
* 自动检测数据表信息
* @access protected
* @return void
*/
protected function _checkTableInfo() {}
protected function _checkTableInfo()
{}
/**
* 得到完整的数据表名
* @access public
* @return string
*/
public function getTableName() {
if(empty($this->trueTableName)) {
public function getTableName()
{
if (empty($this->trueTableName)) {
$tableName = '';
foreach ($this->viewFields as $key=>$view){
foreach ($this->viewFields as $key => $view) {
// 获取数据表名称
if(isset($view['_table'])) {
if (isset($view['_table'])) {
// 2011/10/17 添加实际表名定义支持 可以实现同一个表的视图
$tableName .= $view['_table'];
}else{
$class = $key.'Model';
$model = class_exists($class)? new $class() : M($key);
$tableName .= $model->getTableName();
$tableName .= $view['_table'];
} else {
$class = $key . 'Model';
$model = class_exists($class) ? new $class() : M($key);
$tableName .= $model->getTableName();
}
// 表别名定义
$tableName .= !empty($view['_as'])? ' '.$view['_as'] :' '.$key;
$tableName .= !empty($view['_as']) ? ' ' . $view['_as'] : ' ' . $key;
// 支持ON 条件定义
$tableName .= !empty($view['_on'])? ' ON '.$view['_on'] : '';
$tableName .= !empty($view['_on']) ? ' ON ' . $view['_on'] : '';
// 指定JOIN类型 例如 RIGHT INNER LEFT 下一个表有效
$type = !empty($view['_type'])?$view['_type']:'';
$tableName .= ' '.strtoupper($type).' JOIN ';
$len = strlen($type.'_JOIN ');
$type = !empty($view['_type']) ? $view['_type'] : '';
$tableName .= ' ' . strtoupper($type) . ' JOIN ';
$len = strlen($type . '_JOIN ');
}
$tableName = substr($tableName,0,-$len);
$this->trueTableName = $tableName;
$tableName = substr($tableName, 0, -$len);
$this->trueTableName = $tableName;
}
return $this->trueTableName;
}
@@ -61,20 +64,21 @@ trait View {
* @param string $options 表达式
* @return void
*/
protected function _options_filter(&$options) {
if(isset($options['field'])){
$options['field'] = $this->checkFields($options['field']);
}else{
$options['field'] = $this->checkFields();
protected function _options_filter(&$options)
{
if (isset($options['field'])) {
$options['field'] = $this->checkFields($options['field']);
} else {
$options['field'] = $this->checkFields();
}
if(isset($options['group'])){
$options['group'] = $this->checkGroup($options['group']);
if (isset($options['group'])) {
$options['group'] = $this->checkGroup($options['group']);
}
if(isset($options['where'])){
$options['where'] = $this->checkCondition($options['where']);
if (isset($options['where'])) {
$options['where'] = $this->checkCondition($options['where']);
}
if(isset($options['order'])){
$options['order'] = $this->checkOrder($options['order']);
if (isset($options['order'])) {
$options['order'] = $this->checkOrder($options['order']);
}
}
@@ -85,9 +89,11 @@ trait View {
* @param array $fields 字段数组
* @return array
*/
private function _checkFields($name,$fields) {
if(false !== $pos = array_search('*',$fields)) {// 定义所有字段
$fields = array_merge($fields,M($name)->getDbFields());
private function _checkFields($name, $fields)
{
if (false !== $pos = array_search('*', $fields)) {
// 定义所有字段
$fields = array_merge($fields, M($name)->getDbFields());
unset($fields[$pos]);
}
return $fields;
@@ -99,24 +105,25 @@ trait View {
* @param mixed $data 条件表达式
* @return array
*/
protected function checkCondition($where) {
if(is_array($where)) {
$view = [];
protected function checkCondition($where)
{
if (is_array($where)) {
$view = [];
// 检查视图字段
foreach ($this->viewFields as $key=>$val){
$k = isset($val['_as'])?$val['_as']:$key;
$val = $this->_checkFields($key,$val);
foreach ($where as $name=>$value){
if(false !== $field = array_search($name,$val,true)) {
foreach ($this->viewFields as $key => $val) {
$k = isset($val['_as']) ? $val['_as'] : $key;
$val = $this->_checkFields($key, $val);
foreach ($where as $name => $value) {
if (false !== $field = array_search($name, $val, true)) {
// 存在视图字段
$_key = is_numeric($field)? $k.'.'.$name : $k.'.'.$field;
$view[$_key] = $value;
$_key = is_numeric($field) ? $k . '.' . $name : $k . '.' . $field;
$view[$_key] = $value;
unset($where[$name]);
}
}
}
$where = array_merge($where,$view);
}
$where = array_merge($where, $view);
}
return $where;
}
@@ -126,28 +133,29 @@ trait View {
* @param string $order 字段
* @return string
*/
protected function checkOrder($order='') {
if(is_string($order) && !empty($order)) {
$orders = explode(',',$order);
protected function checkOrder($order = '')
{
if (is_string($order) && !empty($order)) {
$orders = explode(',', $order);
$_order = [];
foreach ($orders as $order){
$array = explode(' ',$order);
$field = $array[0];
$sort = isset($array[1])? $array[1] : 'ASC';
foreach ($orders as $order) {
$array = explode(' ', $order);
$field = $array[0];
$sort = isset($array[1]) ? $array[1] : 'ASC';
// 解析成视图字段
foreach ($this->viewFields as $name=>$val){
$k = isset($val['_as']) ? $val['_as'] : $name;
$val = $this->_checkFields($name,$val);
if(false !== $_field = array_search($field,$val,true)) {
foreach ($this->viewFields as $name => $val) {
$k = isset($val['_as']) ? $val['_as'] : $name;
$val = $this->_checkFields($name, $val);
if (false !== $_field = array_search($field, $val, true)) {
// 存在视图字段
$field = is_numeric($_field)? $k.'.'.$field : $k.'.'.$_field;
$field = is_numeric($_field) ? $k . '.' . $field : $k . '.' . $_field;
break;
}
}
$_order[] = $field.' '.$sort;
$_order[] = $field . ' ' . $sort;
}
$order = implode(',',$_order);
}
$order = implode(',', $_order);
}
return $order;
}
@@ -157,25 +165,26 @@ trait View {
* @param string $group 字段
* @return string
*/
protected function checkGroup($group='') {
if(!empty($group)) {
$groups = explode(',',$group);
protected function checkGroup($group = '')
{
if (!empty($group)) {
$groups = explode(',', $group);
$_group = [];
foreach ($groups as $field){
foreach ($groups as $field) {
// 解析成视图字段
foreach ($this->viewFields as $name=>$val){
$k = isset($val['_as'])? $val['_as'] : $name;
$val = $this->_checkFields($name,$val);
if(false !== $_field = array_search($field,$val,true)) {
foreach ($this->viewFields as $name => $val) {
$k = isset($val['_as']) ? $val['_as'] : $name;
$val = $this->_checkFields($name, $val);
if (false !== $_field = array_search($field, $val, true)) {
// 存在视图字段
$field = is_numeric($_field)? $k.'.'.$field : $k.'.'.$_field;
$field = is_numeric($_field) ? $k . '.' . $field : $k . '.' . $_field;
break;
}
}
$_group[] = $field;
}
$group = implode(',',$_group);
}
$group = implode(',', $_group);
}
return $group;
}
@@ -185,62 +194,63 @@ trait View {
* @param string $fields 字段
* @return string
*/
protected function checkFields($fields='') {
if(empty($fields) || '*'==$fields ) {
protected function checkFields($fields = '')
{
if (empty($fields) || '*' == $fields) {
// 获取全部视图字段
$fields = [];
foreach ($this->viewFields as $name=>$val){
$k = isset($val['_as'])? $val['_as'] : $name;
$val = $this->_checkFields($name,$val);
foreach ($val as $key=>$field){
if(is_numeric($key)) {
$fields[] = $k.'.'.$field.' AS '.$field;
}elseif('_' != substr($key,0,1)) {
$fields = [];
foreach ($this->viewFields as $name => $val) {
$k = isset($val['_as']) ? $val['_as'] : $name;
$val = $this->_checkFields($name, $val);
foreach ($val as $key => $field) {
if (is_numeric($key)) {
$fields[] = $k . '.' . $field . ' AS ' . $field;
} elseif ('_' != substr($key, 0, 1)) {
// 以_开头的为特殊定义
if( false !== strpos($key,'*') || false !== strpos($key,'(') || false !== strpos($key,'.')) {
if (false !== strpos($key, '*') || false !== strpos($key, '(') || false !== strpos($key, '.')) {
//如果包含* 或者 使用了sql方法 则不再添加前面的表名
$fields[] = $key.' AS '.$field;
}else{
$fields[] = $k.'.'.$key.' AS '.$field;
$fields[] = $key . ' AS ' . $field;
} else {
$fields[] = $k . '.' . $key . ' AS ' . $field;
}
}
}
}
$fields = implode(',',$fields);
}else{
if(!is_array($fields)){
$fields = explode(',',$fields);
$fields = implode(',', $fields);
} else {
if (!is_array($fields)) {
$fields = explode(',', $fields);
}
// 解析成视图字段
$array = [];
foreach ($fields as $key=>$field){
if(strpos($field,'(') || strpos(strtolower($field),' as ')){
$array = [];
foreach ($fields as $key => $field) {
if (strpos($field, '(') || strpos(strtolower($field), ' as ')) {
// 使用了函数或者别名
$array[] = $field;
$array[] = $field;
unset($fields[$key]);
}
}
foreach ($this->viewFields as $name=>$val){
$k = isset($val['_as'])? $val['_as'] : $name;
$val = $this->_checkFields($name,$val);
foreach ($fields as $key=>$field){
if(false !== $_field = array_search($field,$val,true)) {
foreach ($this->viewFields as $name => $val) {
$k = isset($val['_as']) ? $val['_as'] : $name;
$val = $this->_checkFields($name, $val);
foreach ($fields as $key => $field) {
if (false !== $_field = array_search($field, $val, true)) {
// 存在视图字段
if(is_numeric($_field)) {
$array[] = $k.'.'.$field.' AS '.$field;
}elseif('_' != substr($_field,0,1)){
if( false !== strpos($_field,'*') || false !== strpos($_field,'(') || false !== strpos($_field,'.')){
if (is_numeric($_field)) {
$array[] = $k . '.' . $field . ' AS ' . $field;
} elseif ('_' != substr($_field, 0, 1)) {
if (false !== strpos($_field, '*') || false !== strpos($_field, '(') || false !== strpos($_field, '.')) {
//如果包含* 或者 使用了sql方法 则不再添加前面的表名
$array[] = $_field.' AS '.$field;
}else{
$array[] = $k.'.'.$_field.' AS '.$field;
$array[] = $_field . ' AS ' . $field;
} else {
$array[] = $k . '.' . $_field . ' AS ' . $field;
}
}
}
}
}
$fields = implode(',',$array);
$fields = implode(',', $array);
}
return $fields;
}
}
}
}