@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | protected function parseStatic($content) |
| 29 | 29 | { |
| 30 | - $content = strlen(trim($content)) === 0 ?'()':$content; |
|
| 30 | + $content = strlen(trim($content)) === 0 ? '()' : $content; |
|
| 31 | 31 | return '<?php echo $this->getStaticModulePrefix'.$content.'; ?>'; |
| 32 | 32 | } |
| 33 | 33 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | protected function parseE($content) |
| 39 | 39 | { |
| 40 | - $content = strlen(trim($content)) === 0 ?'()':$content; |
|
| 40 | + $content = strlen(trim($content)) === 0 ? '()' : $content; |
|
| 41 | 41 | return '<?php echo $this->application->_'.$content.'; ?>'; |
| 42 | 42 | } |
| 43 | 43 | } |
@@ -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 | /** |
| 39 | 39 | * 初始化 |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | public function registerTag(Tag $tag) |
| 83 | 83 | { |
| 84 | - $this->tags[$tag->getName()] =$tag; |
|
| 84 | + $this->tags[$tag->getName()] = $tag; |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | /** |
@@ -95,15 +95,15 @@ discard block |
||
| 95 | 95 | public function compileText(string $text, array $tagConfig = []):string |
| 96 | 96 | { |
| 97 | 97 | $this->applyTagConfig($tagConfig); |
| 98 | - $result = ''; |
|
| 98 | + $result = ''; |
|
| 99 | 99 | foreach (token_get_all($text) as $token) { |
| 100 | 100 | if (is_array($token)) { |
| 101 | 101 | list($tag, $content) = $token; |
| 102 | 102 | // 所有将要编译的文本 |
| 103 | 103 | // 跳过各种的PHP |
| 104 | 104 | if ($tag == T_INLINE_HTML) { |
| 105 | - $content=$this->processTags($content); |
|
| 106 | - $content=$this->processCommands($content); |
|
| 105 | + $content = $this->processTags($content); |
|
| 106 | + $content = $this->processCommands($content); |
|
| 107 | 107 | } |
| 108 | 108 | $result .= $content; |
| 109 | 109 | } else { |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | { |
| 140 | 140 | foreach ($this->tags as $tag) { |
| 141 | 141 | $pregExp = sprintf('/(!)?%s\s*(.+?)\s*%s/', preg_quote($tag->getOpen()), preg_quote($tag->getClose())); |
| 142 | - $text = preg_replace_callback($pregExp, function ($match) use ($tag) { |
|
| 142 | + $text = preg_replace_callback($pregExp, function($match) use ($tag) { |
|
| 143 | 143 | if ($match[1] === '!') { |
| 144 | 144 | return substr($match[0], 1); |
| 145 | 145 | } else { |
@@ -157,8 +157,8 @@ discard block |
||
| 157 | 157 | */ |
| 158 | 158 | protected function processCommands(string $text):string |
| 159 | 159 | { |
| 160 | - $pregExp ='/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux'; |
|
| 161 | - $code = preg_replace_callback($pregExp, [$this,'doMatchCommand'], $text); |
|
| 160 | + $pregExp = '/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux'; |
|
| 161 | + $code = preg_replace_callback($pregExp, [$this, 'doMatchCommand'], $text); |
|
| 162 | 162 | $error = preg_last_error(); |
| 163 | 163 | if ($error !== PREG_NO_ERROR) { |
| 164 | 164 | throw new Exception($error); |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | list($input, $ignore, $name, $space) = $match; |
| 175 | 175 | $params = ''; |
| 176 | 176 | } |
| 177 | - if ($ignore ==='!') { |
|
| 177 | + if ($ignore === '!') { |
|
| 178 | 178 | return str_replace('@!', '@', $input); |
| 179 | 179 | } else { |
| 180 | 180 | foreach ($this->commands as $command) { |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | $group = $group ?? $request->getAttribute('group'); |
| 37 | 37 | $default = $default ?? $request->getAttribute('module'); |
| 38 | 38 | $url = $this->route->create($this->getRouteName($name, $default, $group), $parameter, $allowQuery); |
| 39 | - return $this->getUrlIndex($request) . ltrim($url, '/'); |
|
| 39 | + return $this->getUrlIndex($request).ltrim($url, '/'); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | $module = $default; |
| 74 | 74 | } |
| 75 | 75 | if ($module !== null && ($moduleObj = $this->find($module))) { |
| 76 | - return $moduleObj->getFullName() . ':' . $name; |
|
| 76 | + return $moduleObj->getFullName().':'.$name; |
|
| 77 | 77 | } |
| 78 | 78 | return $name; |
| 79 | 79 | } |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | } |
| 96 | 96 | $prefixGroup = $this->getRouteGroupPrefix($group); |
| 97 | 97 | if ($module !== null && ($moduleObj = $this->find($module))) { |
| 98 | - return $moduleObj->getFullName() . $prefixGroup . ':' . $name; |
|
| 98 | + return $moduleObj->getFullName().$prefixGroup.':'.$name; |
|
| 99 | 99 | } |
| 100 | 100 | return $name; |
| 101 | 101 | } |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | public function getUriBase(Request $request, bool $beautify = true): string |
| 138 | 138 | { |
| 139 | 139 | $index = $beautify ? $this->getUrlIndex($request) : $request->getIndex(); |
| 140 | - return $request->getUriBase() . $index; |
|
| 140 | + return $request->getUriBase().$index; |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -148,6 +148,6 @@ discard block |
||
| 148 | 148 | */ |
| 149 | 149 | protected function getRouteGroupPrefix(?string $group): string |
| 150 | 150 | { |
| 151 | - return $group === null || $group === 'default' ? '' : '@' . $group; |
|
| 151 | + return $group === null || $group === 'default' ? '' : '@'.$group; |
|
| 152 | 152 | } |
| 153 | 153 | } |
@@ -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) { |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | * @param string $name |
| 113 | 113 | * @return Module|null |
| 114 | 114 | */ |
| 115 | - public function get(string $name):?Module |
|
| 115 | + public function get(string $name): ?Module |
|
| 116 | 116 | { |
| 117 | 117 | $full = $this->getFullName($name); |
| 118 | 118 | return $this->module[$full] ?? null; |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | if (array_key_exists($version, $this->knownsFullName[$sortName])) { |
| 206 | 206 | return $this->knownsFullName[$sortName][$version]; |
| 207 | 207 | } |
| 208 | - return $hasVersion?$sortName.':'.$version:end($this->knownsFullName[$sortName]); |
|
| 208 | + return $hasVersion ? $sortName.':'.$version : end($this->knownsFullName[$sortName]); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | protected function getLikeName(string $name):string |