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

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2016-10-11 23:21:43 +08:00
parent ca112f5637 5ff97ce68d
commit 2222cbfd53
5 changed files with 57 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Model.php
View File

@@ -1144,8 +1144,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'], $info['joinType']) ->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'], $info['joinType'])
->group('b.' . $info['foreignKey']) ->group('b.' . $info['foreignKey'])
->having('count(' . $id . ')' . $operator . $count); ->having('count(' . $id . ')' . $operator . $count);
case Relation::HAS_MANY_THROUGH: case Relation::HAS_MANY_THROUGH: // TODO
// TODO default:
return $model;
} }
} }
@@ -1176,8 +1177,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
->field('a.*') ->field('a.*')
->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'], $info['joinType']) ->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'], $info['joinType'])
->where($where); ->where($where);
case Relation::HAS_MANY_THROUGH: case Relation::HAS_MANY_THROUGH: // TODO
// TODO default:
return $model;
} }
} }

5
library/think/Route.php
View File

@@ -305,7 +305,8 @@ class Route
} }
$vars = self::parseVar($rule); $vars = self::parseVar($rule);
if (isset($name)) { if (isset($name)) {
self::name($name, [$rule, $vars, self::$domain]); $key = $group ? $group . '/' . $rule : $rule;
self::name($name, [$key, $vars, self::$domain]);
} }
if ($group) { if ($group) {
if ('*' != $type) { if ('*' != $type) {
@@ -425,7 +426,7 @@ class Route
$vars = self::parseVar($key); $vars = self::parseVar($key);
$item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => $options, 'pattern' => $patterns]; $item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => $options, 'pattern' => $patterns];
// 设置路由标识 // 设置路由标识
self::name($route, [$key, $vars, self::$domain]); self::name($route, [$name . '/' . $key, $vars, self::$domain]);
} }
self::$rules['*'][$name] = ['rule' => $item, 'route' => '', 'var' => [], 'option' => $option, 'pattern' => $pattern]; self::$rules['*'][$name] = ['rule' => $item, 'route' => '', 'var' => [], 'option' => $option, 'pattern' => $pattern];
} }

80
library/think/Template.php
View File

@@ -959,78 +959,66 @@ class Template
* @param array $vars 变量数组 * @param array $vars 变量数组
* @return string * @return string
*/ */
public function parseThinkVar(&$vars) public function parseThinkVar($vars)
{ {
$vars[0] = strtoupper(trim($vars[0])); $type = strtoupper(trim(array_shift($vars)));
$parseStr = ''; $param = implode('.', $vars);
if (count($vars) >= 2) { if ($vars) {
$vars[1] = trim($vars[1]); switch ($type) {
switch ($vars[0]) {
case 'SERVER': case 'SERVER':
$parseStr = '$_SERVER[\'' . strtoupper($vars[1]) . '\']'; $parseStr = '\\think\\Request::instance()->server(\'' . $param . '\')';
break; break;
case 'GET': case 'GET':
$parseStr = '$_GET[\'' . $vars[1] . '\']'; $parseStr = '\\think\\Request::instance()->get(\'' . $param . '\')';
break; break;
case 'POST': case 'POST':
$parseStr = '$_POST[\'' . $vars[1] . '\']'; $parseStr = '\\think\\Request::instance()->post(\'' . $param . '\')';
break; break;
case 'COOKIE': case 'COOKIE':
if (isset($vars[2])) { $parseStr = '\\think\\Cookie::get(\'' . $param . '\')';
$parseStr = '\\think\\Cookie::get(\'' . $vars[1] . '.' . $vars[2] . '\')';
} else {
$parseStr = '\\think\\Cookie::get(\'' . $vars[1] . '\')';
}
break; break;
case 'SESSION': case 'SESSION':
if (isset($vars[2])) { $parseStr = '\\think\\Session::get(\'' . $param . '\')';
$parseStr = '\\think\\Session::get(\'' . $vars[1] . '.' . $vars[2] . '\')';
} else {
$parseStr = '\\think\\Session::get(\'' . $vars[1] . '\')';
}
break; break;
case 'ENV': case 'ENV':
$parseStr = '$_ENV[\'' . strtoupper($vars[1]) . '\']'; $parseStr = '\\think\\Request::instance()->env(\'' . $param . '\')';
break; break;
case 'REQUEST': case 'REQUEST':
$parseStr = '$_REQUEST[\'' . $vars[1] . '\']'; $parseStr = '\\think\\Request::instance()->request(\'' . $param . '\')';
break; break;
case 'CONST': case 'CONST':
$parseStr = strtoupper($vars[1]); $parseStr = strtoupper($param);
break; break;
case 'LANG': case 'LANG':
$parseStr = '\\think\\Lang::get(\'' . $vars[1] . '\')'; $parseStr = '\\think\\Lang::get(\'' . $param . '\')';
break; break;
case 'CONFIG': case 'CONFIG':
if (isset($vars[2])) { $parseStr = '\\think\\Config::get(\'' . $param . '\')';
$vars[1] .= '.' . $vars[2];
}
$parseStr = '\\think\\Config::get(\'' . $vars[1] . '\')';
break; break;
default: default:
$parseStr = '\'\''; $parseStr = '\'\'';
break; break;
} }
} else { } else {
if (count($vars) == 1) { switch ($type) {
switch ($vars[0]) { case 'NOW':
case 'NOW': $parseStr = "date('Y-m-d g:i a',time())";
$parseStr = "date('Y-m-d g:i a',time())"; break;
break; case 'VERSION':
case 'VERSION': $parseStr = 'THINK_VERSION';
$parseStr = 'THINK_VERSION'; break;
break; case 'LDELIM':
case 'LDELIM': $parseStr = '\'' . ltrim($this->config['tpl_begin'], '\\') . '\'';
$parseStr = '\'' . ltrim($this->config['tpl_begin'], '\\') . '\''; break;
break; case 'RDELIM':
case 'RDELIM': $parseStr = '\'' . ltrim($this->config['tpl_end'], '\\') . '\'';
$parseStr = '\'' . ltrim($this->config['tpl_end'], '\\') . '\''; break;
break; default:
default: if (defined($type)) {
if (defined($vars[0])) { $parseStr = $type;
$parseStr = $vars[0]; } else {
} $parseStr = '';
} }
} }
} }
return $parseStr; return $parseStr;

20
library/think/db/Query.php
View File

@@ -377,7 +377,7 @@ class Query
*/ */
public function value($field, $default = null) public function value($field, $default = null)
{ {
$result = null; $result = false;
if (!empty($this->options['cache'])) { if (!empty($this->options['cache'])) {
// 判断查询缓存 // 判断查询缓存
$cache = $this->options['cache']; $cache = $this->options['cache'];
@@ -387,7 +387,7 @@ class Query
$key = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options)); $key = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options));
$result = Cache::get($key); $result = Cache::get($key);
} }
if (!$result) { if (false === $result) {
if (isset($this->options['field'])) { if (isset($this->options['field'])) {
unset($this->options['field']); unset($this->options['field']);
} }
@@ -409,7 +409,7 @@ class Query
// 清空查询条件 // 清空查询条件
$this->options = []; $this->options = [];
} }
return !is_null($result) ? $result : $default; return false !== $result ? $result : $default;
} }
/** /**
@@ -431,7 +431,7 @@ class Query
$guid = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options)); $guid = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options));
$result = Cache::get($guid); $result = Cache::get($guid);
} }
if (!$result) { if (false === $result) {
if (isset($this->options['field'])) { if (isset($this->options['field'])) {
unset($this->options['field']); unset($this->options['field']);
} }
@@ -667,19 +667,17 @@ class Query
if (is_array($join)) { if (is_array($join)) {
if (0 !== $key = key($join)) { if (0 !== $key = key($join)) {
// 设置了键名则键名为表名，键值作为表的别名 // 设置了键名则键名为表名，键值作为表的别名
$table = $key; $table = [$key => array_shift($join)];
$alias = array_shift($join); $this->alias($table);
$this->alias([$table => $alias]);
$table = [$table => $alias];
} else { } else {
$table = array_shift($join); $table = array_shift($join);
} }
} else { } else {
$table = trim($join); $table = trim($join);
if (strpos($table, ' ')) { if (strpos($table, ' ') && !strpos($table, ')')) {
list($table, $alias) = explode(' ', $table); list($table, $alias) = explode(' ', $table);
$this->alias([$table => $alias]); $table = [$table => $alias];
$table = [$table => $alias]; $this->alias($table);
} }
} }
$this->options['join'][] = [$table, strtoupper($type), $condition]; $this->options['join'][] = [$table, strtoupper($type), $condition];

10
tests/thinkphp/library/think/templateTest.php
View File

@@ -291,15 +291,15 @@ EOF;
{\$Think.SITE.URL} {\$Think.SITE.URL}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php echo \$_SERVER['SERVER_NAME']; ?><br/> <?php echo \\think\\Request::instance()->server('SERVER_NAME'); ?><br/>
<?php echo \$_GET['action']; ?><br/> <?php echo \\think\\Request::instance()->get('action'); ?><br/>
<?php echo \$_POST['action']; ?><br/> <?php echo \\think\\Request::instance()->post('action'); ?><br/>
<?php echo \\think\\Cookie::get('action'); ?><br/> <?php echo \\think\\Cookie::get('action'); ?><br/>
<?php echo \\think\\Cookie::get('action.name'); ?><br/> <?php echo \\think\\Cookie::get('action.name'); ?><br/>
<?php echo \\think\\Session::get('action'); ?><br/> <?php echo \\think\\Session::get('action'); ?><br/>
<?php echo \\think\\Session::get('action.name'); ?><br/> <?php echo \\think\\Session::get('action.name'); ?><br/>
<?php echo \$_ENV['OS']; ?><br/> <?php echo \\think\\Request::instance()->env('OS'); ?><br/>
<?php echo \$_REQUEST['action']; ?><br/> <?php echo \\think\\Request::instance()->request('action'); ?><br/>
<?php echo SITE_NAME; ?><br/> <?php echo SITE_NAME; ?><br/>
<?php echo \\think\\Lang::get('action'); ?><br/> <?php echo \\think\\Lang::get('action'); ?><br/>
<?php echo \\think\\Config::get('action.name'); ?><br/> <?php echo \\think\\Config::get('action.name'); ?><br/>