@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | { |
64 | 64 | foreach ($this->application->getModules() as $name => $module) { |
65 | 65 | if ($module->getStatus() === Module::REACHABLE) { |
66 | - call_user_func([$this->moduleLoader[$name],'toReachable']); |
|
66 | + call_user_func([$this->moduleLoader[$name], 'toReachable']); |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | |
121 | 121 | protected function registerModule() |
122 | 122 | { |
123 | - $extractPath = $this->application->getDataPath() .'/extract-module'; |
|
123 | + $extractPath = $this->application->getDataPath().'/extract-module'; |
|
124 | 124 | FileSystem::make($extractPath); |
125 | 125 | foreach ($this->application->getModulePaths() as $path) { |
126 | 126 | $this->registerModuleFrom($path, $extractPath); |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | if (is_array($config)) { |
151 | 151 | $moduleNames = array_keys($modules->all()); |
152 | 152 | // 获取模块文件夹模块配置 |
153 | - $load = $config['load'] ?? $moduleNames; |
|
153 | + $load = $config['load'] ?? $moduleNames; |
|
154 | 154 | $active = $config['active'] ?? $load; |
155 | 155 | $reachable = $config['reachable'] ?? $active; |
156 | 156 | // 获取允许加载的模块 |
@@ -26,14 +26,14 @@ discard block |
||
26 | 26 | * |
27 | 27 | * @var Tag[] |
28 | 28 | */ |
29 | - protected $tags=[]; |
|
29 | + protected $tags = []; |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * 命令对象 |
33 | 33 | * |
34 | 34 | * @var CommandInterface[] |
35 | 35 | */ |
36 | - protected $commands=[]; |
|
36 | + protected $commands = []; |
|
37 | 37 | |
38 | 38 | public function init() |
39 | 39 | { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function registerTag(Tag $tag) |
64 | 64 | { |
65 | - $this->tags[$tag->getName()] =$tag; |
|
65 | + $this->tags[$tag->getName()] = $tag; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -76,15 +76,15 @@ discard block |
||
76 | 76 | public function compileText(string $text, array $tagConfig = []):string |
77 | 77 | { |
78 | 78 | $this->applyTagConfig($tagConfig); |
79 | - $result = ''; |
|
79 | + $result = ''; |
|
80 | 80 | foreach (token_get_all($text) as $token) { |
81 | 81 | if (is_array($token)) { |
82 | 82 | list($tag, $content) = $token; |
83 | 83 | // 所有将要编译的文本 |
84 | 84 | // 跳过各种的PHP |
85 | 85 | if ($tag == T_INLINE_HTML) { |
86 | - $content=$this->proccesTags($content); |
|
87 | - $content=$this->processCommands($content); |
|
86 | + $content = $this->proccesTags($content); |
|
87 | + $content = $this->processCommands($content); |
|
88 | 88 | } |
89 | 89 | $result .= $content; |
90 | 90 | } else { |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | { |
109 | 109 | foreach ($this->tags as $tag) { |
110 | 110 | $pregExp = sprintf('/(!)?%s\s*(.+?)\s*%s/', preg_quote($tag->getOpen()), preg_quote($tag->getClose())); |
111 | - $text = preg_replace_callback($pregExp, function ($match) use ($tag) { |
|
111 | + $text = preg_replace_callback($pregExp, function($match) use ($tag) { |
|
112 | 112 | if ($match[1] === '!') { |
113 | 113 | return substr($match[0], 1); |
114 | 114 | } else { |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | */ |
127 | 127 | protected function processCommands(string $text):string |
128 | 128 | { |
129 | - $pregExp ='/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux'; |
|
130 | - $code = preg_replace_callback($pregExp, [$this,'doMatchCommand'], $text); |
|
129 | + $pregExp = '/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux'; |
|
130 | + $code = preg_replace_callback($pregExp, [$this, 'doMatchCommand'], $text); |
|
131 | 131 | $error = preg_last_error(); |
132 | 132 | if ($error !== PREG_NO_ERROR) { |
133 | 133 | throw new Exception($error); |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | list($input, $ignore, $name, $space) = $match; |
144 | 144 | $params = ''; |
145 | 145 | } |
146 | - if ($ignore ==='!') { |
|
146 | + if ($ignore === '!') { |
|
147 | 147 | return str_replace('@!', '@', $input); |
148 | 148 | } else { |
149 | 149 | foreach ($this->commands as $command) { |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | $subfix = $this->config['subfix'] ?? '.tpl.html'; |
23 | 23 | return $this |
24 | 24 | ->getResource($this->module) |
25 | - ->getResourcePath($this->getTemplatePath() . '/' . $this->name . $subfix); |
|
25 | + ->getResourcePath($this->getTemplatePath().'/'.$this->name.$subfix); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | */ |
33 | 33 | public function getPath() |
34 | 34 | { |
35 | - $output = $this->config['output'] ?? $this->application->getDataPath() . '/template/' . $this->uriName; |
|
35 | + $output = $this->config['output'] ?? $this->application->getDataPath().'/template/'.$this->uriName; |
|
36 | 36 | FileSystem::make($output); |
37 | - return $output . '/' . $this->name . '.php'; |
|
37 | + return $output.'/'.$this->name.'.php'; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
@@ -54,18 +54,18 @@ discard block |
||
54 | 54 | |
55 | 55 | public function getRenderedString() |
56 | 56 | { |
57 | - $this->application->debug()->time('render ' . $this->name); |
|
57 | + $this->application->debug()->time('render '.$this->name); |
|
58 | 58 | $code = parent::getRenderedString(); |
59 | - $this->application->debug()->timeEnd('render ' . $this->name); |
|
59 | + $this->application->debug()->timeEnd('render '.$this->name); |
|
60 | 60 | return $code; |
61 | 61 | } |
62 | 62 | |
63 | 63 | protected function compile() |
64 | 64 | { |
65 | 65 | if ($this->isCompiled() === false) { |
66 | - $this->application->debug()->time('compile ' . $this->name); |
|
66 | + $this->application->debug()->time('compile '.$this->name); |
|
67 | 67 | $result = parent::compile(); |
68 | - $this->application->debug()->timeEnd('compile ' . $this->name); |
|
68 | + $this->application->debug()->timeEnd('compile '.$this->name); |
|
69 | 69 | return $result; |
70 | 70 | } |
71 | 71 | return true; |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | } |
104 | 104 | return $this->application->getUrl($this->request, $name, $values ?? [], true, $this->module, $this->group); |
105 | 105 | } elseif (is_string($defaultName)) { |
106 | - $parameter = is_array($name)?array_merge($query, $name):$query; |
|
106 | + $parameter = is_array($name) ?array_merge($query, $name) : $query; |
|
107 | 107 | return $this->application->getUrl( |
108 | 108 | $this->request, |
109 | 109 | $defaultName, |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | $this->group |
114 | 114 | ); |
115 | 115 | } |
116 | - return '#' . $defaultName; |
|
116 | + return '#'.$defaultName; |
|
117 | 117 | } |
118 | 118 | |
119 | 119 |
@@ -18,10 +18,10 @@ |
||
18 | 18 | protected $tag = [ |
19 | 19 | 'raw' => ['{{!', '}}', '<?php echo $code; ?>'], |
20 | 20 | 'comment' => ['{--', '--}', '<?php /* $code */ ?>'], |
21 | - 'echo' => [ '{{', '}}', '<?php echo htmlspecialchars($this->application->_($code), ENT_SUBSTITUTE | ENT_QUOTES | ENT_HTML5); ?>' ], |
|
21 | + 'echo' => ['{{', '}}', '<?php echo htmlspecialchars($this->application->_($code), ENT_SUBSTITUTE | ENT_QUOTES | ENT_HTML5); ?>'], |
|
22 | 22 | 'string' => ['{=', '}', '<?php echo htmlspecialchars($this->application->_("$code"), ENT_SUBSTITUTE | ENT_QUOTES | ENT_HTML5); ?>'], |
23 | - 'raw-string' => ['@{', '}', '<?php echo htmlspecialchars($code, ENT_SUBSTITUTE | ENT_QUOTES | ENT_HTML5); ?>' ], |
|
24 | - 'event' => ['{:', '}', '<?php $this->application->event()->exec("$code", [$this]); ?>' ], |
|
23 | + 'raw-string' => ['@{', '}', '<?php echo htmlspecialchars($code, ENT_SUBSTITUTE | ENT_QUOTES | ENT_HTML5); ?>'], |
|
24 | + 'event' => ['{:', '}', '<?php $this->application->event()->exec("$code", [$this]); ?>'], |
|
25 | 25 | ]; |
26 | 26 | |
27 | 27 | public function init() |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @param string $path |
80 | 80 | * @return Module|null |
81 | 81 | */ |
82 | - public function guess(string $path):?Module |
|
82 | + public function guess(string $path): ?Module |
|
83 | 83 | { |
84 | 84 | foreach ($this->module as $module) { |
85 | 85 | if (FileSystem::isOverflowPath($module->getPath(), $path) === false) { |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * @throws ApplicationException |
115 | 115 | * @return Module|null |
116 | 116 | */ |
117 | - public function get(string $name):?Module |
|
117 | + public function get(string $name): ?Module |
|
118 | 118 | { |
119 | 119 | $full = $this->getFullName($name); |
120 | 120 | return $this->module[$full] ?? null; |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | if (array_key_exists($version, $this->knownsFullName[$sortName])) { |
210 | 210 | return $this->knownsFullName[$sortName][$version]; |
211 | 211 | } |
212 | - return $hasVersion?$sortName.':'.$version:end($this->knownsFullName[$sortName]); |
|
212 | + return $hasVersion ? $sortName.':'.$version : end($this->knownsFullName[$sortName]); |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | protected function getLikeName(string $name):string |
@@ -8,12 +8,12 @@ |
||
8 | 8 | use suda\framework\http\HTTPRequest; |
9 | 9 | use suda\application\builder\ApplicationBuilder; |
10 | 10 | |
11 | -require_once __DIR__ .'/loader.php'; |
|
11 | +require_once __DIR__.'/loader.php'; |
|
12 | 12 | |
13 | 13 | // 初始化系统加载器 |
14 | 14 | $loader = new Loader; |
15 | 15 | $loader->register(); |
16 | -$loader->addIncludePath(SUDA_SYSTEM .'/src', 'suda'); |
|
16 | +$loader->addIncludePath(SUDA_SYSTEM.'/src', 'suda'); |
|
17 | 17 | // 初始化数据目录 |
18 | 18 | defined('SUDA_DATA') or define('SUDA_DATA', Path::toAbsolutePath('~/data')); |
19 | 19 | defined('SUDA_APP_MANIFEST') or define('SUDA_APP_MANIFEST', SUDA_APP.'/manifest'); |