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

修正block标签嵌套不能解析的问题，改进对未定义变量输出的判断

Browse Source
This commit is contained in:
oldrind
2016-06-28 10:14:50 +08:00
parent 9ca4911c44
commit ab1ee18364
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
library/think/Template.php
View File

@@ -556,9 +556,15 @@ class Template
$children[$parent][] = $name; $children[$parent][] = $name;
continue; continue;
} }
} elseif (!empty($val['parent'])) {
// 如果子标签没有被继承则用原值
$children[$val['parent']][] = $name;
$blocks[$name] = $val;
}
if (!$val['parent']) {
// 替换模板中的顶级block标签
$extend = str_replace($val['begin'] . $val['content'] . $val['end'], $replace, $extend);
} }
// 替换模板中的block标签
$extend = str_replace($val['begin'] . $val['content'] . $val['end'], $replace, $extend);
} }
} }
$content = $extend; $content = $extend;
@@ -735,20 +741,15 @@ class Template
$str = trim(substr($str, $pos + 1)); $str = trim(substr($str, $pos + 1));
$this->parseVar($str); $this->parseVar($str);
$first = substr($str, 0, 1); $first = substr($str, 0, 1);
if (isset($array[1])) { if (strpos($name, ')')) {
$this->parseVar($array[2]);
$name .= $array[1] . $array[2];
if ('=' == $first) {
// {$varname?='xxx'} $varname为真时才输出xxx
$str = '<?php if(' . $name . ') echo ' . substr($str, 1) . '; ?>';
} else {
$str = '<?php echo (' . $name . ')?' . $str . '; ?>';
}
} elseif (')' == substr($name, -1, 1)) {
// $name为对象或是自动识别，或者含有函数 // $name为对象或是自动识别，或者含有函数
if (isset($array[1])) {
$this->parseVar($array[2]);
$name .= $array[1] . $array[2];
}
switch ($first) { switch ($first) {
case '?': case '?':
$str = '<?php echo ' . $name . ' ? ' . $name . ' : ' . substr($str, 1) . '; ?>'; $str = '<?php echo (' . $name . ') ? ' . $name . ' : ' . substr($str, 1) . '; ?>';
break; break;
case '=': case '=':
$str = '<?php if(' . $name . ') echo ' . substr($str, 1) . '; ?>'; $str = '<?php if(' . $name . ') echo ' . substr($str, 1) . '; ?>';
@@ -757,26 +758,32 @@ class Template
$str = '<?php echo ' . $name . '?' . $str . '; ?>'; $str = '<?php echo ' . $name . '?' . $str . '; ?>';
} }
} else { } else {
if (isset($array[1])) {
$this->parseVar($array[2]);
$_name = ' && ' . $name . $array[1] . $array[2];
} else {
$_name = '';
}
// $name为数组 // $name为数组
switch ($first) { switch ($first) {
case '?': case '?':
// {$varname??'xxx'} $varname有定义则输出$varname,否则输出xxx // {$varname??'xxx'} $varname有定义则输出$varname,否则输出xxx
$str = '<?php echo isset(' . $name . ') ? ' . $name . ' : ' . substr($str, 1) . '; ?>'; $str = '<?php echo isset(' . $name . ')' . $_name . ' ? ' . $name . ' : ' . substr($str, 1) . '; ?>';
break; break;
case '=': case '=':
// {$varname?='xxx'} $varname为真时才输出xxx // {$varname?='xxx'} $varname为真时才输出xxx
$str = '<?php if(!empty(' . $name . ')) echo ' . substr($str, 1) . '; ?>'; $str = '<?php if(!empty(' . $name . ')' . $_name . ') echo ' . substr($str, 1) . '; ?>';
break; break;
case ':': case ':':
// {$varname?:'xxx'} $varname为真时输出$varname,否则输出xxx // {$varname?:'xxx'} $varname为真时输出$varname,否则输出xxx
$str = '<?php echo !empty(' . $name . ')?' . $name . $str . '; ?>'; $str = '<?php echo !empty(' . $name . ')' . $_name . '?' . $name . $str . '; ?>';
break; break;
default: default:
if (strpos($str, ':')) { if (strpos($str, ':')) {
// {$varname ? 'a' : 'b'} $varname为真时输出a,否则输出b // {$varname ? 'a' : 'b'} $varname为真时输出a,否则输出b
$str = '<?php echo !empty(' . $name . ')?' . $str . '; ?>'; $str = '<?php echo !empty(' . $name . ')' . $_name . '?' . $str . '; ?>';
} else { } else {
$str = '<?php echo ' . $name . '?' . $str . '; ?>'; $str = '<?php echo ' . $_name . '?' . $str . '; ?>';
} }
} }
} }

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

@@ -78,7 +78,7 @@ EOF;
{\$name.a==\$name.b?='test'} {\$name.a==\$name.b?='test'}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$name['a']==\$name['b']) echo 'test'; ?> <?php if(!empty(\$name['a']) && \$name['a']==\$name['b']) echo 'test'; ?>
EOF; EOF;
$template->parse($content); $template->parse($content);
@@ -88,7 +88,7 @@ EOF;
{\$name.a==\$name.b?'a':'b'} {\$name.a==\$name.b?'a':'b'}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php echo (\$name['a']==\$name['b'])?'a':'b'; ?> <?php echo !empty(\$name['a']) && \$name['a']==\$name['b']?'a':'b'; ?>
EOF; EOF;
$template->parse($content); $template->parse($content);
@@ -98,7 +98,7 @@ EOF;
{\$name.a|default='test'==\$name.b?'a':'b'} {\$name.a|default='test'==\$name.b?'a':'b'}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php echo ((isset(\$name['a']) && (\$name['a'] !== '')?\$name['a']:'test')==\$name['b'])?'a':'b'; ?> <?php echo (isset(\$name['a']) && (\$name['a'] !== '')?\$name['a']:'test')==\$name['b']?'a':'b'; ?>
EOF; EOF;
$template->parse($content); $template->parse($content);
@@ -210,7 +210,7 @@ EOF;
<#\$info.a??'test'#> <#\$info.a??'test'#>
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php echo (is_array(\$info)?\$info['a']:\$info->a) ? (is_array(\$info)?\$info['a']:\$info->a) : 'test'; ?> <?php echo ((is_array(\$info)?\$info['a']:\$info->a)) ? (is_array(\$info)?\$info['a']:\$info->a) : 'test'; ?>
EOF; EOF;
$template->parse($content); $template->parse($content);
@@ -326,7 +326,7 @@ EOF;
]; ];
$data = ['name' => 'value']; $data = ['name' => 'value'];
$template->layout('layout')->fetch('display', $data, $config); $template->layout('layout')->fetch('display', $data, $config);
$this->expectOutputString('value'); $this->expectOutputString('<div>value</div>');
} }
public function testDisplay() public function testDisplay()
@@ -407,7 +407,7 @@ EOF;
public function testIsCache() public function testIsCache()
{ {
$template = new Template(['cache_id' => '__CACHE_ID__', 'display_cache' => true]); $template = new Template(['cache_id' => '__CACHE_ID__', 'display_cache' => true]);
$this->assertTrue(!$template->isCache('__CACHE_ID__')); $this->assertTrue($template->isCache('__CACHE_ID__'));
$template->display_cache = false; $template->display_cache = false;
$this->assertTrue(!$template->isCache('__CACHE_ID__')); $this->assertTrue(!$template->isCache('__CACHE_ID__'));
} }