@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | try { |
104 | 104 | $reflectClass = new ReflectionClass($statement->getFetchClass()); |
105 | 105 | } catch (ReflectionException $e) { |
106 | - throw new FetchResultException('error create class: '. $e->getMessage(), $e->getCode(), $e); |
|
106 | + throw new FetchResultException('error create class: '.$e->getMessage(), $e->getCode(), $e); |
|
107 | 107 | } |
108 | 108 | $object = $reflectClass->newInstanceArgs($statement->getFetchClassArgs()); |
109 | 109 | if (method_exists($object, '__set')) { |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | try { |
134 | 134 | $property = $reflectClass->getProperty($propertyName); |
135 | 135 | } catch (ReflectionException $e) { |
136 | - throw new FetchResultException('error create property: '. $e->getMessage(), $e->getCode(), $e); |
|
136 | + throw new FetchResultException('error create property: '.$e->getMessage(), $e->getCode(), $e); |
|
137 | 137 | } |
138 | 138 | $property->setAccessible(true); |
139 | 139 | $property->setValue($object, $value); |
@@ -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 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | protected function getStaticOutpath() |
109 | 109 | { |
110 | - $path = $this->config['assets-public'] ?? constant('SUDA_PUBLIC') . '/assets/' . $this->getStaticName(); |
|
110 | + $path = $this->config['assets-public'] ?? constant('SUDA_PUBLIC').'/assets/'.$this->getStaticName(); |
|
111 | 111 | FileSystem::make($path); |
112 | 112 | return $path; |
113 | 113 | } |
@@ -119,9 +119,9 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public function getPath() |
121 | 121 | { |
122 | - $output = $this->config['output'] ?? constant('SUDA_DATA') . '/template'; |
|
122 | + $output = $this->config['output'] ?? constant('SUDA_DATA').'/template'; |
|
123 | 123 | FileSystem::make($output); |
124 | - return $output . '/' . $this->name . '-' . substr(md5_file($this->getSourcePath()), 10, 8) . '.php'; |
|
124 | + return $output.'/'.$this->name.'-'.substr(md5_file($this->getSourcePath()), 10, 8).'.php'; |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | /** |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | public function include(string $path) |
229 | 229 | { |
230 | 230 | $subfix = $this->config['subfix'] ?? ''; |
231 | - $included = new self(Resource::getPathByRelativePath($path . $subfix, dirname($this->source)), $this->config); |
|
231 | + $included = new self(Resource::getPathByRelativePath($path.$subfix, dirname($this->source)), $this->config); |
|
232 | 232 | $included->parent = $this; |
233 | 233 | echo $included->getRenderedString(); |
234 | 234 | } |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | } else { |
258 | 258 | $prefix = '/assets'; |
259 | 259 | } |
260 | - return '/'.ltrim($prefix, '/') . '/' . $this->getStaticName(); |
|
260 | + return '/'.ltrim($prefix, '/').'/'.$this->getStaticName(); |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | protected function prepareStaticSource() |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | } |
297 | 297 | } |
298 | 298 | } catch (Exception $e) { |
299 | - echo '<div style="color:red">' . $e->getMessage() . '</div>'; |
|
299 | + echo '<div style="color:red">'.$e->getMessage().'</div>'; |
|
300 | 300 | return; |
301 | 301 | } |
302 | 302 | } |
@@ -73,13 +73,13 @@ |
||
73 | 73 | ); |
74 | 74 | $exported = []; |
75 | 75 | foreach ($props as $value) { |
76 | - $name = dechex($value->getModifiers()) . '$' . $value->getName(); |
|
76 | + $name = dechex($value->getModifiers()).'$'.$value->getName(); |
|
77 | 77 | $value->setAccessible(true); |
78 | 78 | $exported[$name] = new DebugObject($value->getValue($object), $this); |
79 | 79 | } |
80 | 80 | return $exported; |
81 | 81 | } catch (\ReflectionException $e) { |
82 | - return 'Err:' . $e->getMessage(); |
|
82 | + return 'Err:'.$e->getMessage(); |
|
83 | 83 | } |
84 | 84 | } |
85 | 85 |
@@ -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 |
@@ -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'); |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | public function loadVendorIfExist() |
85 | 85 | { |
86 | - $vendorAutoload = $this->application->getPath() . '/vendor/autoload.php'; |
|
86 | + $vendorAutoload = $this->application->getPath().'/vendor/autoload.php'; |
|
87 | 87 | if (FileSystem::exist($vendorAutoload)) { |
88 | 88 | require_once $vendorAutoload; |
89 | 89 | } |
@@ -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); |