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

@@ -14,12 +14,14 @@ namespace think\behavior;
/**
* 系统行为扩展:定位模板文件
*/
class LocationTemplate {
class LocationTemplate
{
// 行为扩展的执行入口必须是run
public function run(&$templateFile){
public function run(&$templateFile)
{
// 自动定位模板文件
if(!is_file($templateFile)){
$templateFile = $this->parseTemplateFile($templateFile);
if (!is_file($templateFile)) {
$templateFile = $this->parseTemplateFile($templateFile);
}
}
@@ -29,17 +31,18 @@ class LocationTemplate {
* @param string $templateFile 文件名
* @return string
*/
private function parseTemplateFile($template) {
$template = str_replace(':','/',$template);
if(''==$template) {
private function parseTemplateFile($template)
{
$template = str_replace(':', '/', $template);
if ('' == $template) {
// 如果模板文件名为空 按照默认规则定位
$template = CONTROLLER_NAME.'/'.ACTION_NAME;
}elseif(false === strpos($template,'/')){
$template = CONTROLLER_NAME.'/'.$template;
}elseif(false === strpos($template,'.')) {
$template = $template;
$template = CONTROLLER_NAME . '/' . ACTION_NAME;
} elseif (false === strpos($template, '/')) {
$template = CONTROLLER_NAME . '/' . $template;
} elseif (false === strpos($template, '.')) {
$template = $template;
}
$templateFile = MODULE_PATH.'view/'.$template.'.html';
$templateFile = MODULE_PATH . 'view/' . $template . '.html';
return $templateFile;
}
}