@@ -110,7 +110,7 @@ |
||
110 | 110 | public function get(string $name = null, $default = null) |
111 | 111 | { |
112 | 112 | if ($name !== null) { |
113 | - return $this->has($name) ?$_SESSION[$name]:$default; |
|
113 | + return $this->has($name) ? $_SESSION[$name] : $default; |
|
114 | 114 | } else { |
115 | 115 | return $_SESSION; |
116 | 116 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | */ |
9 | 9 | interface DumpInterface |
10 | 10 | { |
11 | - public static function parameterToString($object, int $deep=2); |
|
11 | + public static function parameterToString($object, int $deep = 2); |
|
12 | 12 | public static function dumpThrowable(Throwable $e); |
13 | - public static function dumpTrace(array $backtrace, bool $str=true, string $perfix=''); |
|
13 | + public static function dumpTrace(array $backtrace, bool $str = true, string $perfix = ''); |
|
14 | 14 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $this->config = $config; |
80 | 80 | $this->name = $name ?? 'anonymous'; |
81 | 81 | $this->observer = new NullObserver; |
82 | - register_shutdown_function(function () { |
|
82 | + register_shutdown_function(function() { |
|
83 | 83 | $this->onBeforeSystemShutdown(); |
84 | 84 | }); |
85 | 85 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | try { |
108 | 108 | $this->pdo = $this->createPDO(); |
109 | 109 | $this->id = static::$connectionCount; |
110 | - static::$connectionCount ++; |
|
110 | + static::$connectionCount++; |
|
111 | 111 | } catch (PDOException $e) { |
112 | 112 | throw new SQLException(sprintf( |
113 | 113 | "%s connect database error:%s", |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | */ |
181 | 181 | public function beginTransaction() |
182 | 182 | { |
183 | - $this->transaction ++; |
|
183 | + $this->transaction++; |
|
184 | 184 | if ($this->transaction == 1) { |
185 | 185 | $this->pdo->beginTransaction(); |
186 | 186 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | { |
58 | 58 | if (array_key_exists($name, $this->processor)) { |
59 | 59 | if ($this->processor[$name] === ObjectMiddleware::SERIALIZE) { |
60 | - return $data === null? $data : serialize($data); |
|
60 | + return $data === null ? $data : serialize($data); |
|
61 | 61 | } |
62 | 62 | if ($this->processor[$name] === ObjectMiddleware::JSON) { |
63 | 63 | return json_encode($data); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | if ($doc = $property->getDocComment()) { |
114 | 114 | if (is_string($doc) && preg_match('/@var\s+(\w+)/i', $doc, $match)) { |
115 | 115 | $type = strtolower($match[1]); |
116 | - if (in_array($type, ['boolean', 'bool', 'integer', 'int' , 'float' , 'double', 'string'])) { |
|
116 | + if (in_array($type, ['boolean', 'bool', 'integer', 'int', 'float', 'double', 'string'])) { |
|
117 | 117 | return ObjectMiddleware::RAW; |
118 | 118 | } |
119 | 119 | } |
@@ -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->processTags($content); |
|
87 | - $content=$this->processCommands($content); |
|
86 | + $content = $this->processTags($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) { |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | $subfix = $this->config['subfix'] ?? '.tpl.html'; |
24 | 24 | $path = $this |
25 | 25 | ->getResource($this->module) |
26 | - ->getResourcePath($this->getTemplatePath() . '/' . $this->name . $subfix); |
|
26 | + ->getResourcePath($this->getTemplatePath().'/'.$this->name.$subfix); |
|
27 | 27 | $this->loadDynamicTemplateConfig($path.'.ini'); |
28 | 28 | return $path; |
29 | 29 | } |
@@ -48,9 +48,9 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function getPath() |
50 | 50 | { |
51 | - $output = $this->config['output'] ?? $this->application->getDataPath() . '/template/' . $this->uriName; |
|
51 | + $output = $this->config['output'] ?? $this->application->getDataPath().'/template/'.$this->uriName; |
|
52 | 52 | FileSystem::make($output); |
53 | - return $output . '/' . $this->name . '.php'; |
|
53 | + return $output.'/'.$this->name.'.php'; |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | /** |
@@ -74,9 +74,9 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function getRenderedString() |
76 | 76 | { |
77 | - $this->application->debug()->time('render ' . $this->name); |
|
77 | + $this->application->debug()->time('render '.$this->name); |
|
78 | 78 | $code = parent::getRenderedString(); |
79 | - $this->application->debug()->timeEnd('render ' . $this->name); |
|
79 | + $this->application->debug()->timeEnd('render '.$this->name); |
|
80 | 80 | return $code; |
81 | 81 | } |
82 | 82 | |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | protected function compile() |
88 | 88 | { |
89 | 89 | if ($this->isCompiled() === false) { |
90 | - $this->application->debug()->time('compile ' . $this->name); |
|
90 | + $this->application->debug()->time('compile '.$this->name); |
|
91 | 91 | $result = parent::compile(); |
92 | - $this->application->debug()->timeEnd('compile ' . $this->name); |
|
92 | + $this->application->debug()->timeEnd('compile '.$this->name); |
|
93 | 93 | return $result; |
94 | 94 | } |
95 | 95 | return true; |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | } |
114 | 114 | return $this->application->getUrl($this->request, $name, $values ?? [], true, $this->module, $this->group); |
115 | 115 | } elseif (is_string($defaultName)) { |
116 | - $parameter = is_array($name)?array_merge($query, $name):$query; |
|
116 | + $parameter = is_array($name) ?array_merge($query, $name) : $query; |
|
117 | 117 | return $this->application->getUrl( |
118 | 118 | $this->request, |
119 | 119 | $defaultName, |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $this->group |
124 | 124 | ); |
125 | 125 | } |
126 | - return '#' . $defaultName; |
|
126 | + return '#'.$defaultName; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | { |
25 | 25 | $this->loadVendorIfExist(); |
26 | 26 | $this->loadShareLibrary(); |
27 | - $this->application->debug()->debug('loaded - ' . $this->module->getFullName()); |
|
27 | + $this->application->debug()->debug('loaded - '.$this->module->getFullName()); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | public function toActive() |
36 | 36 | { |
37 | 37 | $this->loadConfig(); |
38 | - $this->application->debug()->debug('active = ' . $this->module->getFullName()); |
|
38 | + $this->application->debug()->debug('active = '.$this->module->getFullName()); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | public function toReachable() |
46 | 46 | { |
47 | 47 | $this->loadRoute(); |
48 | - $this->application->debug()->debug('reachable # ' . $this->module->getFullName()); |
|
48 | + $this->application->debug()->debug('reachable # '.$this->module->getFullName()); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $this->checkRequirements(); |
57 | 57 | $this->loadPrivateLibrary(); |
58 | 58 | $this->application->setRunning($this->module); |
59 | - $this->application->debug()->debug('run + ' . $this->module->getFullName()); |
|
59 | + $this->application->debug()->debug('run + '.$this->module->getFullName()); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public function loadVendorIfExist() |
105 | 105 | { |
106 | - $vendorAutoload = $this->module->getPath() . '/vendor/autoload.php'; |
|
106 | + $vendorAutoload = $this->module->getPath().'/vendor/autoload.php'; |
|
107 | 107 | if (FileSystem::exist($vendorAutoload)) { |
108 | 108 | Loader::requireOnce($vendorAutoload); |
109 | 109 | } |
@@ -175,8 +175,8 @@ discard block |
||
175 | 175 | */ |
176 | 176 | protected function loadRouteGroup(string $groupName) |
177 | 177 | { |
178 | - $group = $groupName === 'default' ? '' : '-' . $groupName; |
|
179 | - if ($path = $this->module->getResource()->getConfigResourcePath('config/route' . $group)) { |
|
178 | + $group = $groupName === 'default' ? '' : '-'.$groupName; |
|
179 | + if ($path = $this->module->getResource()->getConfigResourcePath('config/route'.$group)) { |
|
180 | 180 | $routeConfig = Config::loadConfig($path, [ |
181 | 181 | 'module' => $this->module->getName(), |
182 | 182 | 'group' => $groupName, |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | 'config' => $this->module->getConfig(), |
185 | 185 | ]); |
186 | 186 | if ($routeConfig !== null) { |
187 | - $prefix = $this->module->getConfig('route-prefix.' . $groupName, ''); |
|
187 | + $prefix = $this->module->getConfig('route-prefix.'.$groupName, ''); |
|
188 | 188 | $this->loadRouteConfig($prefix, $groupName, $routeConfig); |
189 | 189 | } |
190 | 190 | } |
@@ -212,9 +212,9 @@ discard block |
||
212 | 212 | $uri = $config['uri'] ?? '/'; |
213 | 213 | $anti = array_key_exists('anti-prefix', $config) && $config['anti-prefix']; |
214 | 214 | if ($anti) { |
215 | - $uri = '/' . trim($uri, '/'); |
|
215 | + $uri = '/'.trim($uri, '/'); |
|
216 | 216 | } else { |
217 | - $uri = '/' . trim($prefix . $uri, '/'); |
|
217 | + $uri = '/'.trim($prefix.$uri, '/'); |
|
218 | 218 | } |
219 | 219 | $this->application->request($method, $exname, $uri, $attributes); |
220 | 220 | } |
@@ -72,7 +72,7 @@ |
||
72 | 72 | */ |
73 | 73 | public static function getDataSourceFrom(ApplicationResource $resource, string $groupName) |
74 | 74 | { |
75 | - $group = $groupName === 'default' ? '': '-'. $groupName; |
|
75 | + $group = $groupName === 'default' ? '' : '-'.$groupName; |
|
76 | 76 | $dataSourceConfigPath = $resource->getConfigResourcePath('config/data-source'.$group); |
77 | 77 | $dataSource = new DataSource; |
78 | 78 | if ($dataSourceConfigPath !== null) { |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | { |
41 | 41 | $path = $source; |
42 | 42 | if (Path::isRelativePath($source)) { |
43 | - $path = $relative . '/' . $path; |
|
43 | + $path = $relative.'/'.$path; |
|
44 | 44 | } |
45 | 45 | return Path::toAbsolutePath($path); |
46 | 46 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | foreach ($this->resource as $root) { |
97 | 97 | if ($pathInfo = $this->getTarget($root, $path)) { |
98 | 98 | list($root, $target) = $pathInfo; |
99 | - $templateLimitPath = $limitPath ? $root . '/' . $limitPath : $root; |
|
99 | + $templateLimitPath = $limitPath ? $root.'/'.$limitPath : $root; |
|
100 | 100 | if (FileSystem::exist($target) |
101 | 101 | && FileSystem::isOverflowPath($templateLimitPath, $target) === false) { |
102 | 102 | return $target; |
@@ -115,11 +115,11 @@ discard block |
||
115 | 115 | private function getTarget($root, string $path) |
116 | 116 | { |
117 | 117 | if (is_string($root)) { |
118 | - return [$root, $root . '/' . $path]; |
|
118 | + return [$root, $root.'/'.$path]; |
|
119 | 119 | } |
120 | 120 | list($prefix, $root) = $root; |
121 | 121 | if (strpos($path, $prefix) === 0) { |
122 | - return [$root, $root . '/' . ltrim(substr($path, strlen($prefix)), '/')]; |
|
122 | + return [$root, $root.'/'.ltrim(substr($path, strlen($prefix)), '/')]; |
|
123 | 123 | } |
124 | 124 | return null; |
125 | 125 | } |