@@ -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 | |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | { |
| 124 | 124 | $config = $this->getModuleConfig($module); |
| 125 | 125 | $name = $name ?? $this->getModuleConfig($module)['static']; |
| 126 | - $path = $config['assets-path'].'/'. $this->getModuleUriName($module) .'/'.$name; |
|
| 126 | + $path = $config['assets-path'].'/'.$this->getModuleUriName($module).'/'.$name; |
|
| 127 | 127 | FileSystem::make($path); |
| 128 | 128 | return $path; |
| 129 | 129 | } |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | $this->prepareStaticModuleSource($module, $name); |
| 169 | 169 | $config = TemplateUtil::getConfig($this->application, $module); |
| 170 | 170 | $name = $name ?? $config['static']; |
| 171 | - return $this->getModuleStaticAssetRoot($module) .'/'.$this->getModuleUriName($module). '/'.$name; |
|
| 171 | + return $this->getModuleStaticAssetRoot($module).'/'.$this->getModuleUriName($module).'/'.$name; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | /** |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | if ($module === null) { |
| 181 | 181 | $module = $this->module; |
| 182 | 182 | } |
| 183 | - return $this->getModuleAssetRoot($module) .'/'.$this->getModuleUriName($module); |
|
| 183 | + return $this->getModuleAssetRoot($module).'/'.$this->getModuleUriName($module); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | /** |
@@ -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 parseFile($content) |
| 39 | 39 | { |
| 40 | - $content = strlen(trim($content)) === 0 ?'()':$content; |
|
| 40 | + $content = strlen(trim($content)) === 0 ? '()' : $content; |
|
| 41 | 41 | return '<?php echo $this->getModulePrefix'.$content.'; ?>'; |
| 42 | 42 | } |
| 43 | 43 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | /** |
| 45 | 45 | * @return array|null |
| 46 | 46 | */ |
| 47 | - private function seekSourcePath():?array |
|
| 47 | + private function seekSourcePath(): ?array |
|
| 48 | 48 | { |
| 49 | 49 | $extArray = []; |
| 50 | 50 | if (array_key_exists('subfix', $this->config)) { |
@@ -54,9 +54,9 @@ discard block |
||
| 54 | 54 | $extArray['.php'] = true; |
| 55 | 55 | $resource = $this->getResource($this->module); |
| 56 | 56 | foreach ($extArray as $ext => $isRaw) { |
| 57 | - $path = $resource->getResourcePath($this->getTemplatePath() . '/' . $this->name . $ext); |
|
| 57 | + $path = $resource->getResourcePath($this->getTemplatePath().'/'.$this->name.$ext); |
|
| 58 | 58 | if ($path !== null) { |
| 59 | - return [$path , $isRaw]; |
|
| 59 | + return [$path, $isRaw]; |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | return null; |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | public function has(string $name): bool |
| 24 | 24 | { |
| 25 | - return method_exists($this, 'parse' . ucfirst($name)); |
|
| 25 | + return method_exists($this, 'parse'.ucfirst($name)); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | /** |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | public function parse(string $name, string $content): string |
| 34 | 34 | { |
| 35 | 35 | if ($this->has($name)) { |
| 36 | - return $this->{'parse' . ucfirst($name)}($this->parseEchoValue($content)); |
|
| 36 | + return $this->{'parse'.ucfirst($name)}($this->parseEchoValue($content)); |
|
| 37 | 37 | } |
| 38 | 38 | return ''; |
| 39 | 39 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | { |
| 66 | 66 | preg_match('/\((.+)\)/', $exp, $v); |
| 67 | 67 | $name = trim(str_replace('\'', '-', trim($v[1], '"\''))); |
| 68 | - return '<?php $this->insert(\'' . $name . '\',function () { ?>'; |
|
| 68 | + return '<?php $this->insert(\''.$name.'\',function () { ?>'; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | */ |
| 181 | 181 | protected function parseInclude($content) |
| 182 | 182 | { |
| 183 | - return '<?php $this->include' . $content . '; ?>'; |
|
| 183 | + return '<?php $this->include'.$content.'; ?>'; |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | /** |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | */ |
| 190 | 190 | protected function parseExtend($content) |
| 191 | 191 | { |
| 192 | - return '<?php $this->extend' . $content . '; ?>'; |
|
| 192 | + return '<?php $this->extend'.$content.'; ?>'; |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | /** |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | protected function parseStatic($content) |
| 200 | 200 | { |
| 201 | 201 | $content = strlen(trim($content)) === 0 ? '()' : $content; |
| 202 | - return '<?php echo $this->getStaticPrefix' . $content . '; ?>'; |
|
| 202 | + return '<?php echo $this->getStaticPrefix'.$content.'; ?>'; |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | /** |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | protected function whereStringArray(string $where, array $whereBinder) |
| 172 | 172 | { |
| 173 | 173 | list($where, $whereBinder) = $this->prepareWhereString($where, $whereBinder); |
| 174 | - $this->where = 'WHERE ' . $where; |
|
| 174 | + $this->where = 'WHERE '.$where; |
|
| 175 | 175 | $this->binder = $this->mergeBinder($this->binder, $whereBinder); |
| 176 | 176 | } |
| 177 | 177 | |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | */ |
| 184 | 184 | public function groupBy(string $what) |
| 185 | 185 | { |
| 186 | - $this->groupBy = 'GROUP BY ' . $what; |
|
| 186 | + $this->groupBy = 'GROUP BY '.$what; |
|
| 187 | 187 | return $this; |
| 188 | 188 | } |
| 189 | 189 | |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | { |
| 228 | 228 | |
| 229 | 229 | list($having, $havingBinder) = $this->prepareWhereString($having, $havingBinder); |
| 230 | - $this->having = 'HAVING ' . $having; |
|
| 230 | + $this->having = 'HAVING '.$having; |
|
| 231 | 231 | $this->binder = $this->mergeBinder($this->binder, $havingBinder); |
| 232 | 232 | } |
| 233 | 233 | |
@@ -242,9 +242,9 @@ discard block |
||
| 242 | 242 | { |
| 243 | 243 | $order = strtoupper($order); |
| 244 | 244 | if (strlen($this->orderBy) > 0) { |
| 245 | - $this->orderBy .= ',`' . $what . '` ' . $order; |
|
| 245 | + $this->orderBy .= ',`'.$what.'` '.$order; |
|
| 246 | 246 | } else { |
| 247 | - $this->orderBy = 'ORDER BY `' . $what . '` ' . $order; |
|
| 247 | + $this->orderBy = 'ORDER BY `'.$what.'` '.$order; |
|
| 248 | 248 | } |
| 249 | 249 | return $this; |
| 250 | 250 | } |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | */ |
| 259 | 259 | public function limit(int $start, int $length = null) |
| 260 | 260 | { |
| 261 | - $this->limit = 'LIMIT ' . $start . ($length !== null ? ',' . $length : ''); |
|
| 261 | + $this->limit = 'LIMIT '.$start.($length !== null ? ','.$length : ''); |
|
| 262 | 262 | return $this; |
| 263 | 263 | } |
| 264 | 264 | |