@@ -134,7 +134,7 @@ |
||
| 134 | 134 | protected function getFilePath(string $name) |
| 135 | 135 | { |
| 136 | 136 | $path = md5($name); |
| 137 | - $savePath = $this->path.'/'.substr($path, 0,2); |
|
| 137 | + $savePath = $this->path.'/'.substr($path, 0, 2); |
|
| 138 | 138 | FileSystem::make($savePath); |
| 139 | 139 | return $savePath.'/'.$path.'.cache'; |
| 140 | 140 | } |
@@ -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) { |
@@ -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 |
@@ -32,20 +32,20 @@ |
||
| 32 | 32 | $replace = []; |
| 33 | 33 | $attribute = array_merge($this->attribute, $attribute); |
| 34 | 34 | foreach ($attribute as $key => $val) { |
| 35 | - $replace['%' . $key . '%'] = $val; |
|
| 35 | + $replace['%'.$key.'%'] = $val; |
|
| 36 | 36 | } |
| 37 | 37 | $message = strtr($message, $replace); |
| 38 | 38 | $attachInfo = ''; |
| 39 | 39 | foreach ($context as $name => $value) { |
| 40 | - $attachInfo .= $name . ' = '; |
|
| 40 | + $attachInfo .= $name.' = '; |
|
| 41 | 41 | if ($value instanceof AttachValueInterface) { |
| 42 | - $attachInfo .= $value->getLogAttach() . PHP_EOL; |
|
| 42 | + $attachInfo .= $value->getLogAttach().PHP_EOL; |
|
| 43 | 43 | } else { |
| 44 | - $attachInfo .= DumpTrait::parameterToString($value) . PHP_EOL; |
|
| 44 | + $attachInfo .= DumpTrait::parameterToString($value).PHP_EOL; |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | if (strlen($attachInfo) > 0) { |
| 48 | - return $message . PHP_EOL . $attachInfo; |
|
| 48 | + return $message.PHP_EOL.$attachInfo; |
|
| 49 | 49 | } |
| 50 | 50 | return $message; |
| 51 | 51 | } |
@@ -50,9 +50,9 @@ discard block |
||
| 50 | 50 | $replace = []; |
| 51 | 51 | $attach = []; |
| 52 | 52 | foreach ($context as $key => $val) { |
| 53 | - $replaceKey = '{' . $key . '}'; |
|
| 53 | + $replaceKey = '{'.$key.'}'; |
|
| 54 | 54 | if ($this->canBeStringValue($val) && strpos($message, $replaceKey) !== false) { |
| 55 | - $replace['{' . $key . '}'] = $val; |
|
| 55 | + $replace['{'.$key.'}'] = $val; |
|
| 56 | 56 | } else { |
| 57 | 57 | $attach[$key] = $val; |
| 58 | 58 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); |
| 103 | 103 | $pos = min($pow, count($human) - 1); |
| 104 | 104 | $bytes /= (1 << (10 * $pos)); |
| 105 | - return round($bytes, $precision) . ' ' . $human[$pos]; |
|
| 105 | + return round($bytes, $precision).' '.$human[$pos]; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | public function time(string $name, string $type = LogLevel::INFO) |
@@ -44,13 +44,13 @@ discard block |
||
| 44 | 44 | protected static function fixConfig(Application $application, ?string $module, array $config) |
| 45 | 45 | { |
| 46 | 46 | if (!array_key_exists('assets-prefix', $config)) { |
| 47 | - $config['assets-prefix'] = defined('SUDA_ASSETS') ? constant('SUDA_ASSETS'): 'assets'; |
|
| 47 | + $config['assets-prefix'] = defined('SUDA_ASSETS') ? constant('SUDA_ASSETS') : 'assets'; |
|
| 48 | 48 | } |
| 49 | 49 | if (!array_key_exists('static', $config)) { |
| 50 | 50 | $config['static'] = 'static'; |
| 51 | 51 | } |
| 52 | 52 | if (!array_key_exists('assets-path', $config)) { |
| 53 | - $config['assets-path'] = SUDA_PUBLIC. '/'.$config['assets-prefix']; |
|
| 53 | + $config['assets-path'] = SUDA_PUBLIC.'/'.$config['assets-prefix']; |
|
| 54 | 54 | } |
| 55 | 55 | if (!array_key_exists('static-name', $config)) { |
| 56 | 56 | $config['uri-name'] = static::getSafeUriName($application, $module); |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | $assetRoot = static::getAssetRoot($application, $module); |
| 116 | 116 | if (in_array($request->getIndex(), $application->conf('index', ['/index.php']))) { |
| 117 | 117 | $name = static::isAssetsWritable($application, $module) |
| 118 | - ? dirname($request->getIndex()):$request->getIndex(); |
|
| 118 | + ? dirname($request->getIndex()) : $request->getIndex(); |
|
| 119 | 119 | return rtrim(str_replace('\\', '/', $name), '/').$assetRoot; |
| 120 | 120 | } |
| 121 | 121 | return rtrim(str_replace('\\', '/', $request->getIndex()), '/').$assetRoot; |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | ?string $module = null |
| 152 | 152 | ):string { |
| 153 | 153 | $assetRoot = static::getAssetRoot($application, $module); |
| 154 | - $name = static::isAssetsWritable($application, $module) ? dirname($request->getIndex()):$request->getIndex(); |
|
| 154 | + $name = static::isAssetsWritable($application, $module) ? dirname($request->getIndex()) : $request->getIndex(); |
|
| 155 | 155 | return rtrim(str_replace('\\', '/', $name), '/').$assetRoot; |
| 156 | 156 | } |
| 157 | 157 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | protected function getStaticOutputPath(?string $name = null) |
| 104 | 104 | { |
| 105 | 105 | $public = defined('SUDA_PUBLIC') ? constant('SUDA_PUBLIC') : '.'; |
| 106 | - $path = $this->config['assets-public'] ?? $public . '/assets/' . $this->getStaticName($name); |
|
| 106 | + $path = $this->config['assets-public'] ?? $public.'/assets/'.$this->getStaticName($name); |
|
| 107 | 107 | FileSystem::make($path); |
| 108 | 108 | return $path; |
| 109 | 109 | } |
@@ -118,9 +118,9 @@ discard block |
||
| 118 | 118 | if ($this->isRaw()) { |
| 119 | 119 | return $this->source; |
| 120 | 120 | } |
| 121 | - $output = $this->config['output'] ?? constant('SUDA_DATA') . '/template'; |
|
| 121 | + $output = $this->config['output'] ?? constant('SUDA_DATA').'/template'; |
|
| 122 | 122 | FileSystem::make($output); |
| 123 | - return $output . '/' . $this->name . '-' . substr(md5_file($this->getSourcePath()), 10, 8) . '.php'; |
|
| 123 | + return $output.'/'.$this->name.'-'.substr(md5_file($this->getSourcePath()), 10, 8).'.php'; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | /** |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | $sourcePath = $this->getSourcePath(); |
| 184 | 184 | if ($sourcePath === null) { |
| 185 | 185 | throw new NoTemplateFoundException( |
| 186 | - 'missing source ' . $this->name, |
|
| 186 | + 'missing source '.$this->name, |
|
| 187 | 187 | E_USER_ERROR, |
| 188 | 188 | $this->name, |
| 189 | 189 | NoTemplateFoundException::T_SOURCE |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | public function include(string $path) |
| 204 | 204 | { |
| 205 | 205 | $subfix = $this->config['subfix'] ?? ''; |
| 206 | - $included = new self(Resource::getPathByRelativePath($path . $subfix, dirname($this->source)), $this->config); |
|
| 206 | + $included = new self(Resource::getPathByRelativePath($path.$subfix, dirname($this->source)), $this->config); |
|
| 207 | 207 | $included->parent = $this; |
| 208 | 208 | echo $included->getRenderedString(); |
| 209 | 209 | } |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | } else { |
| 223 | 223 | $prefix = '/assets'; |
| 224 | 224 | } |
| 225 | - return '/' . ltrim($prefix, '/') . '/' . $this->getStaticName($name); |
|
| 225 | + return '/'.ltrim($prefix, '/').'/'.$this->getStaticName($name); |
|
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | /** |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | } catch (Exception $e) { |
| 161 | - echo '<div style="color:red">' . $e->getMessage() . '</div>'; |
|
| 161 | + echo '<div style="color:red">'.$e->getMessage().'</div>'; |
|
| 162 | 162 | return; |
| 163 | 163 | } |
| 164 | 164 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | return ob_get_clean() ?: ''; |
| 180 | 180 | } |
| 181 | 181 | throw new NoTemplateFoundException( |
| 182 | - 'missing dest at ' . $this->getPath(), |
|
| 182 | + 'missing dest at '.$this->getPath(), |
|
| 183 | 183 | E_USER_ERROR, |
| 184 | 184 | $this->getPath(), |
| 185 | 185 | 1 |
@@ -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 | /** |
@@ -58,18 +58,18 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | public function getRenderedString() |
| 60 | 60 | { |
| 61 | - $this->application->debug()->time('render ' . $this->name); |
|
| 61 | + $this->application->debug()->time('render '.$this->name); |
|
| 62 | 62 | $code = parent::getRenderedString(); |
| 63 | - $this->application->debug()->timeEnd('render ' . $this->name); |
|
| 63 | + $this->application->debug()->timeEnd('render '.$this->name); |
|
| 64 | 64 | return $code; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | protected function compile() |
| 68 | 68 | { |
| 69 | 69 | if ($this->isCompiled() === false) { |
| 70 | - $this->application->debug()->time('compile ' . $this->name); |
|
| 70 | + $this->application->debug()->time('compile '.$this->name); |
|
| 71 | 71 | $result = parent::compile(); |
| 72 | - $this->application->debug()->timeEnd('compile ' . $this->name); |
|
| 72 | + $this->application->debug()->timeEnd('compile '.$this->name); |
|
| 73 | 73 | return $result; |
| 74 | 74 | } |
| 75 | 75 | return true; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | } |
| 108 | 108 | return $this->application->getUrl($this->request, $name, $values ?? [], true, $this->module, $this->group); |
| 109 | 109 | } elseif (is_string($defaultName)) { |
| 110 | - $parameter = is_array($name)?array_merge($query, $name):$query; |
|
| 110 | + $parameter = is_array($name) ?array_merge($query, $name) : $query; |
|
| 111 | 111 | return $this->application->getUrl( |
| 112 | 112 | $this->request, |
| 113 | 113 | $defaultName, |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $this->group |
| 118 | 118 | ); |
| 119 | 119 | } |
| 120 | - return '#' . $defaultName; |
|
| 120 | + return '#'.$defaultName; |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | |