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

Merge pull request #243 from oldrind/template

Browse Source 
提升template类测试覆盖率，修正include标签传变量
This commit is contained in:
Chino Chang
2016-01-28 17:58:26 +08:00
parent c3f7fbc25e db0eae9d5d
commit a1c9c450a6
6 changed files with 119 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
library/think/Template.php
View File

@@ -383,6 +383,9 @@ class Template
$parseStr = $this->parseTemplateName($file);
// 替换变量
foreach ($array as $k => $v) {
if (0 == strpos($v, '$')) {
$v = ltrim($this->config['tpl_begin'], '\\') . $v . ltrim($this->config['tpl_end'], '\\');
}
$parseStr = str_replace('[' . $k . ']', $v, $parseStr);
}
// 再次对包含文件进行模板分析
@@ -455,10 +458,12 @@ class Template
$regex = $this->getRegex($restore ? 'restoreliteral' : 'literal');
if (preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
if (!$restore) {
$count = count($this->literal);
// 替换literal标签
foreach ($matches as $i => $match) {
$this->literal[] = substr($match[0], strlen($match[1]), -strlen($match[2]));
$content = str_replace($match[0], "<!--###literal{$i}###-->", $content);
$content = str_replace($match[0], "<!--###literal{$count}###-->", $content);
$count++;
}
} else {
// 还原literal标签
@@ -821,14 +826,14 @@ class Template
if (isset($vars[2])) {
$parseStr = '$_COOKIE[\'' . $vars[1] . '\'][\'' . $vars[2] . '\']';
} else {
$parseStr = '\\think\\cookie::get(\'' . $vars[1] . '\')';
$parseStr = '\\think\\Cookie::get(\'' . $vars[1] . '\')';
}
break;
case 'SESSION':
if (isset($vars[2])) {
$parseStr = '$_SESSION[\'' . $vars[1] . '\'][\'' . $vars[2] . '\']';
} else {
$parseStr = '\\think\\session::get(\'' . $vars[1] . '\')';
$parseStr = '\\think\\Session::get(\'' . $vars[1] . '\')';
}
break;
case 'ENV':
@@ -841,13 +846,13 @@ class Template
$parseStr = strtoupper($vars[1]);
break;
case 'LANG':
$parseStr = '\\think\\lang::get(\'' . $vars[1] . '\')';
$parseStr = '\\think\\Lang::get(\'' . $vars[1] . '\')';
break;
case 'CONFIG':
if (isset($vars[2])) {
$vars[1] .= '.' . $vars[2];
}
$parseStr = '\\think\\config::get(\'' . $vars[1] . '\')';
$parseStr = '\\think\\Config::get(\'' . $vars[1] . '\')';
break;
default:
break;
@@ -862,10 +867,10 @@ class Template
$parseStr = 'THINK_VERSION';
break;
case 'LDELIM':
$parseStr = $this->config['tpl_begin'];
$parseStr = '\'' . ltrim($this->config['tpl_begin'], '\\') . '\'';
break;
case 'RDELIM':
$parseStr = $this->config['tpl_end'];
$parseStr = '\'' . ltrim($this->config['tpl_end'], '\\') . '\'';
break;
default:
if (defined($vars[0])) {

14
library/think/template/TagLib.php
View File

@@ -136,12 +136,12 @@ class TagLib
// 标签替换 从后向前
foreach ($nodes as $pos => $node) {
// 对应的标签名
$name = $tags[1][$node['name']];
$name = $node['name'];
// 解析标签属性
$attrs = $this->parseAttr($node['begin'][0], $name);
$method = '_' . $name;
// 读取标签库中对应的标签内容 replace[0]用来替换标签头，replace[1]用来替换标签尾
$replace = explode($break, $this->$method($attrs, $break, $node['name']));
$replace = explode($break, $this->$method($attrs, $break));
if (count($replace) > 1) {
while ($beginArray) {
$begin = end($beginArray);
@@ -171,13 +171,13 @@ class TagLib
// 自闭合标签
if (!empty($tags[0])) {
$regex = $this->getRegex(array_keys($tags[0]), 0);
$self = &$this;
$content = preg_replace_callback($regex, function ($matches) use (&$tags, &$self) {
$name = $tags[0][$matches[1]];
$content = preg_replace_callback($regex, function ($matches) use (&$tags) {
// 对应的标签名
$name = $matches[1];
// 解析标签属性
$attrs = $self->parseAttr($matches[0], $name);
$attrs = $this->parseAttr($matches[0], $name);
$method = '_' . $name;
return $self->$method($attrs, '', $matches[1]);
return $this->$method($attrs, '');
}, $content);
}
return;