@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | { |
214 | 214 | $model = $this->createModel(); |
215 | 215 | |
216 | - $query = $model->newQuery()->where('decomposed', 'like', $this->decomposer->execute($string) . '%') |
|
216 | + $query = $model->newQuery()->where('decomposed', 'like', $this->decomposer->execute($string).'%') |
|
217 | 217 | ->orderBy('count', 'desc') |
218 | 218 | ->take($take); |
219 | 219 | |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | */ |
268 | 268 | public function setModel($model) |
269 | 269 | { |
270 | - $this->model = '\\' . ltrim($model, '\\'); |
|
270 | + $this->model = '\\'.ltrim($model, '\\'); |
|
271 | 271 | |
272 | 272 | return $this; |
273 | 273 | } |
@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public function execute($string) |
52 | 52 | { |
53 | - $cho = ["ㄱ","ㄲ","ㄴ","ㄷ","ㄸ","ㄹ","ㅁ","ㅂ","ㅃ","ㅅ", |
|
54 | - "ㅆ","ㅇ","ㅈ","ㅉ","ㅊ","ㅋ","ㅌ","ㅍ","ㅎ"]; |
|
55 | - $jung = ["ㅏ","ㅐ","ㅑ","ㅒ","ㅓ","ㅔ","ㅕ","ㅖ","ㅗ","ㅘ","ㅙ", |
|
56 | - "ㅚ","ㅛ","ㅜ","ㅝ","ㅞ","ㅟ","ㅠ","ㅡ","ㅢ","ㅣ"]; |
|
57 | - $jong = ["","ㄱ","ㄲ","ㄳ","ㄴ","ㄵ","ㄶ","ㄷ","ㄹ","ㄺ","ㄻ","ㄼ","ㄽ","ㄾ", |
|
58 | - "ㄿ","ㅀ","ㅁ","ㅂ","ㅄ","ㅅ","ㅆ","ㅇ","ㅈ","ㅊ","ㅋ"," ㅌ","ㅍ","ㅎ"]; |
|
53 | + $cho = ["ㄱ", "ㄲ", "ㄴ", "ㄷ", "ㄸ", "ㄹ", "ㅁ", "ㅂ", "ㅃ", "ㅅ", |
|
54 | + "ㅆ", "ㅇ", "ㅈ", "ㅉ", "ㅊ", "ㅋ", "ㅌ", "ㅍ", "ㅎ"]; |
|
55 | + $jung = ["ㅏ", "ㅐ", "ㅑ", "ㅒ", "ㅓ", "ㅔ", "ㅕ", "ㅖ", "ㅗ", "ㅘ", "ㅙ", |
|
56 | + "ㅚ", "ㅛ", "ㅜ", "ㅝ", "ㅞ", "ㅟ", "ㅠ", "ㅡ", "ㅢ", "ㅣ"]; |
|
57 | + $jong = ["", "ㄱ", "ㄲ", "ㄳ", "ㄴ", "ㄵ", "ㄶ", "ㄷ", "ㄹ", "ㄺ", "ㄻ", "ㄼ", "ㄽ", "ㄾ", |
|
58 | + "ㄿ", "ㅀ", "ㅁ", "ㅂ", "ㅄ", "ㅅ", "ㅆ", "ㅇ", "ㅈ", "ㅊ", "ㅋ", " ㅌ", "ㅍ", "ㅎ"]; |
|
59 | 59 | |
60 | 60 | $result = ""; |
61 | 61 | for ($i = 0; $i < $this->strlen($string); $i++) { |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $choIdx = $code / 588; |
66 | 66 | $jungIdx = $code % 588 / 28; |
67 | 67 | $jongIdx = $code % 28; |
68 | - $result .= $cho[$choIdx] . $jung[$jungIdx] . $jong[$jongIdx]; |
|
68 | + $result .= $cho[$choIdx].$jung[$jungIdx].$jong[$jongIdx]; |
|
69 | 69 | } else { |
70 | 70 | $result .= $char; |
71 | 71 | } |
@@ -119,13 +119,13 @@ discard block |
||
119 | 119 | if ($h < 0xC2) { |
120 | 120 | return null; |
121 | 121 | } |
122 | - if ($h <= 0xDF && $len>1) { |
|
123 | - return ($h & 0x1F) << 6 | (ord($ch{1}) & 0x3F); |
|
122 | + if ($h <= 0xDF && $len > 1) { |
|
123 | + return ($h & 0x1F) << 6 | (ord($ch{1}) & 0x3F); |
|
124 | 124 | } |
125 | - if ($h <= 0xEF && $len>2) { |
|
125 | + if ($h <= 0xEF && $len > 2) { |
|
126 | 126 | return ($h & 0x0F) << 12 | (ord($ch{1}) & 0x3F) << 6 | (ord($ch{2}) & 0x3F); |
127 | 127 | } |
128 | - if ($h <= 0xF4 && $len>3) { |
|
128 | + if ($h <= 0xF4 && $len > 3) { |
|
129 | 129 | return ($h & 0x0F) << 18 | (ord($ch{1}) & 0x3F) << 12 | (ord($ch{2}) & 0x3F) << 6 | (ord($ch{3}) & 0x3F); |
130 | 130 | } |
131 | 131 | } |
@@ -89,7 +89,7 @@ |
||
89 | 89 | $this->getSkinPath($view), |
90 | 90 | $this->data, |
91 | 91 | [ |
92 | - '_skin' => function ($path) { |
|
92 | + '_skin' => function($path) { |
|
93 | 93 | return $this->getSkinPath($path); |
94 | 94 | }, |
95 | 95 | '_config' => $this->config |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | */ |
238 | 238 | public function getMobileResolver() |
239 | 239 | { |
240 | - return $this->mobileResolver ?: function () { |
|
240 | + return $this->mobileResolver ?: function() { |
|
241 | 241 | }; |
242 | 242 | } |
243 | 243 | |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | $skins = $this->getList($target, $isSettings); |
300 | 300 | return array_where( |
301 | 301 | $skins, |
302 | - function ($id, $entity) { |
|
302 | + function($id, $entity) { |
|
303 | 303 | /** @var SkinEntity $entity */ |
304 | 304 | return $entity->supportMobile(); |
305 | 305 | } |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $skins = $this->getList($target, $isSettings); |
320 | 320 | return array_where( |
321 | 321 | $skins, |
322 | - function ($id, $entity) { |
|
322 | + function($id, $entity) { |
|
323 | 323 | /** @var SkinEntity $entity */ |
324 | 324 | return $entity->supportDesktop(); |
325 | 325 | } |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | */ |
238 | 238 | public function getMobileResolver() |
239 | 239 | { |
240 | - return $this->mobileResolver ?: function () { |
|
240 | + return $this->mobileResolver ?: function() { |
|
241 | 241 | }; |
242 | 242 | } |
243 | 243 | |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | $skins = $this->getList($target, $isSettings); |
300 | 300 | return array_where( |
301 | 301 | $skins, |
302 | - function ($id, $entity) { |
|
302 | + function($id, $entity) { |
|
303 | 303 | /** @var SkinEntity $entity */ |
304 | 304 | return $entity->supportMobile(); |
305 | 305 | } |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $skins = $this->getList($target, $isSettings); |
320 | 320 | return array_where( |
321 | 321 | $skins, |
322 | - function ($id, $entity) { |
|
322 | + function($id, $entity) { |
|
323 | 323 | /** @var SkinEntity $entity */ |
324 | 324 | return $entity->supportDesktop(); |
325 | 325 | } |
@@ -333,6 +333,6 @@ |
||
333 | 333 | */ |
334 | 334 | public function setModel($model) |
335 | 335 | { |
336 | - $this->model = '\\' . ltrim($model, '\\'); |
|
336 | + $this->model = '\\'.ltrim($model, '\\'); |
|
337 | 337 | } |
338 | 338 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | if (!str_contains($email, '@')) { |
58 | 58 | $emailPrefix = $email; |
59 | 59 | |
60 | - $query = $query->whereHas('emails', function ($q) use ($emailPrefix) { |
|
60 | + $query = $query->whereHas('emails', function($q) use ($emailPrefix) { |
|
61 | 61 | $q->where('address', 'like', $emailPrefix.'@%'); |
62 | 62 | })->get(); |
63 | 63 | |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | return null; |
68 | 68 | } |
69 | 69 | } else { |
70 | - $user = $query->whereHas('emails', function ($q) use ($email) { |
|
70 | + $user = $query->whereHas('emails', function($q) use ($email) { |
|
71 | 71 | $q->where('address', $email); |
72 | 72 | })->first(); |
73 | 73 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $title = $this->getTitleInput(); |
59 | 59 | $path = app('xe.plugin')->getPluginsDir().'/'.$name; |
60 | 60 | |
61 | - if($this->checkEnv($path, $name, $namespace, $title) === false) { |
|
61 | + if ($this->checkEnv($path, $name, $namespace, $title) === false) { |
|
62 | 62 | return false; |
63 | 63 | } |
64 | 64 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | } |
103 | 103 | |
104 | 104 | // check namespace |
105 | - if(!str_contains($namespace, '\\')) { |
|
105 | + if (!str_contains($namespace, '\\')) { |
|
106 | 106 | $this->error('The namespace must have at least 1 delimiter(\\), use double backslash(\\\\) as delimiter'); |
107 | 107 | return false; |
108 | 108 | } |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | $output = $this->output; |
422 | 422 | |
423 | 423 | $process->run( |
424 | - function ($type, $line) use ($output) { |
|
424 | + function($type, $line) use ($output) { |
|
425 | 425 | $output->write($line); |
426 | 426 | } |
427 | 427 | ); |
@@ -62,12 +62,12 @@ discard block |
||
62 | 62 | $id = $this->getThemeId($plugin, $file); |
63 | 63 | $title = $this->getThemeTitle(); |
64 | 64 | $description = $this->getThemeDescription($id, $plugin); |
65 | - $templateView = strtolower(last(explode('@',$id))); |
|
65 | + $templateView = strtolower(last(explode('@', $id))); |
|
66 | 66 | $template = $this->getTemplatePath($templateView, $plugin); |
67 | 67 | $css = $this->getCssPath($id, $plugin); |
68 | 68 | |
69 | 69 | // print and confirm the information of theme |
70 | - if($this->confirmInfo($file, $namespace.'\\'.$class, $plugin, $id, $title, $description, $template, $css) === false){ |
|
70 | + if ($this->confirmInfo($file, $namespace.'\\'.$class, $plugin, $id, $title, $description, $template, $css) === false) { |
|
71 | 71 | return false; |
72 | 72 | } |
73 | 73 | |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $this->makeCss($plugin, $css); |
79 | 79 | |
80 | 80 | // composer.json 파일 수정 |
81 | - if($this->registerTheme($plugin, 'theme/'.$id, $namespace.'\\'.$class, $title, $description) === false) { |
|
81 | + if ($this->registerTheme($plugin, 'theme/'.$id, $namespace.'\\'.$class, $title, $description) === false) { |
|
82 | 82 | throw new \Exception('Writing to composer.json file was failed.'); |
83 | 83 | } |
84 | 84 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | * DummyCssFile |
130 | 130 | */ |
131 | 131 | |
132 | - if($class === $pluginClass) { |
|
132 | + if ($class === $pluginClass) { |
|
133 | 133 | $pluginClass = $pluginClass.'Plugin'; |
134 | 134 | } |
135 | 135 | |
@@ -183,22 +183,22 @@ discard block |
||
183 | 183 | { |
184 | 184 | $id = $this->option('id'); |
185 | 185 | |
186 | - if(!$id) { |
|
187 | - $fileName = basename($file,'.php'); |
|
186 | + if (!$id) { |
|
187 | + $fileName = basename($file, '.php'); |
|
188 | 188 | $id = $plugin.'@'.strtolower($fileName); |
189 | 189 | } else { |
190 | - if(strpos('theme/', $id) === 0) { |
|
190 | + if (strpos('theme/', $id) === 0) { |
|
191 | 191 | $id = substr($id, 6); |
192 | 192 | } |
193 | 193 | |
194 | - if(strpos($id, '@') === false) { |
|
194 | + if (strpos($id, '@') === false) { |
|
195 | 195 | $id = $plugin.'@'.$id; |
196 | 196 | } |
197 | 197 | } |
198 | 198 | |
199 | 199 | $theme = \App::make('xe.theme')->getTheme($id); |
200 | 200 | |
201 | - if($theme !== null) { |
|
201 | + if ($theme !== null) { |
|
202 | 202 | throw new \Exception("Theme[$theme] already exists."); |
203 | 203 | } |
204 | 204 | |
@@ -217,13 +217,13 @@ discard block |
||
217 | 217 | { |
218 | 218 | $paths = explode('/', $file); |
219 | 219 | |
220 | - if($paths[0] === str_replace(base_path().'/', '', app('xe.plugin')->getPluginsDir())) { |
|
220 | + if ($paths[0] === str_replace(base_path().'/', '', app('xe.plugin')->getPluginsDir())) { |
|
221 | 221 | array_shift($paths); |
222 | 222 | } |
223 | 223 | |
224 | 224 | $plugin = array_shift($paths); |
225 | 225 | |
226 | - if(app('xe.plugin')->getPlugin($plugin) === null) { |
|
226 | + if (app('xe.plugin')->getPlugin($plugin) === null) { |
|
227 | 227 | throw new \Exception("Unable to find a plugin to locate the theme file. plugin[$plugin] is not found."); |
228 | 228 | } |
229 | 229 | |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | protected function getThemeDescription($id, $plugin) |
252 | 252 | { |
253 | 253 | $description = $this->option('description'); |
254 | - if(!$description) { |
|
254 | + if (!$description) { |
|
255 | 255 | $description = sprintf( |
256 | 256 | '%s theme from %s plugin.', |
257 | 257 | ucfirst(last(explode('@', $id))), ucfirst($plugin) |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | protected function getThemeFile() |
270 | 270 | { |
271 | 271 | $filePath = $this->argument('file'); |
272 | - if(file_exists($filePath)) { |
|
272 | + if (file_exists($filePath)) { |
|
273 | 273 | throw new \Exception("file[$filePath] already exists."); |
274 | 274 | } |
275 | 275 | return $filePath; |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | { |
289 | 289 | $entity = \App::make('xe.plugin')->getPlugin($plugin); |
290 | 290 | $viewFile = 'views/theme/'.$id.'.blade.php'; |
291 | - if(file_exists($entity->getPath($viewFile))) { |
|
291 | + if (file_exists($entity->getPath($viewFile))) { |
|
292 | 292 | throw new \Exception("template file[views/$viewFile] already exists."); |
293 | 293 | } |
294 | 294 | return $viewFile; |
@@ -306,9 +306,9 @@ discard block |
||
306 | 306 | protected function getCssPath($id, $plugin) |
307 | 307 | { |
308 | 308 | $entity = \App::make('xe.plugin')->getPlugin($plugin); |
309 | - $file = strtolower(last(explode('@',$id))); |
|
309 | + $file = strtolower(last(explode('@', $id))); |
|
310 | 310 | $cssFile = 'assets/theme/'.$file.'.css'; |
311 | - if(file_exists($entity->getPath($cssFile))) { |
|
311 | + if (file_exists($entity->getPath($cssFile))) { |
|
312 | 312 | throw new \Exception("template file[views/$cssFile] already exists."); |
313 | 313 | } |
314 | 314 | return $cssFile; |
@@ -344,8 +344,8 @@ discard block |
||
344 | 344 | ) |
345 | 345 | ); |
346 | 346 | |
347 | - while($confirm = $this->ask('Do you want to add theme? [yes|no]')) { |
|
348 | - if($confirm === 'yes') { |
|
347 | + while ($confirm = $this->ask('Do you want to add theme? [yes|no]')) { |
|
348 | + if ($confirm === 'yes') { |
|
349 | 349 | return true; |
350 | 350 | } else { |
351 | 351 | return false; |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | |
385 | 385 | $this->files->put(base_path($file), $code); |
386 | 386 | |
387 | - if(!class_exists($namespace.'\\'.$class)) { |
|
387 | + if (!class_exists($namespace.'\\'.$class)) { |
|
388 | 388 | $this->files->delete(base_path($file)); |
389 | 389 | throw new \Exception("Unable to load the theme class file[$file]. please check autoload setting of composer.json"); |
390 | 390 | } |
@@ -449,11 +449,11 @@ discard block |
||
449 | 449 | |
450 | 450 | if ($unescapeUnicode && function_exists('mb_convert_encoding')) { |
451 | 451 | // https://stackoverflow.com/questions/2934563/how-to-decode-unicode-escape-sequences-like-u00ed-to-proper-utf-8-encoded-cha |
452 | - $buffer = preg_replace_callback('/(\\\\+)u([0-9a-f]{4})/i', function ($match) { |
|
452 | + $buffer = preg_replace_callback('/(\\\\+)u([0-9a-f]{4})/i', function($match) { |
|
453 | 453 | $l = strlen($match[1]); |
454 | 454 | |
455 | 455 | if ($l % 2) { |
456 | - return str_repeat('\\', $l - 1) . mb_convert_encoding( |
|
456 | + return str_repeat('\\', $l - 1).mb_convert_encoding( |
|
457 | 457 | pack('H*', $match[2]), |
458 | 458 | 'UTF-8', |
459 | 459 | 'UCS-2BE' |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | $this->originComposerStr = $composerStr; |
530 | 530 | $json = json_decode($composerStr, true); |
531 | 531 | $component = data_get($json, 'extra.xpressengine.component'); |
532 | - if(isset($component[$id])) { |
|
532 | + if (isset($component[$id])) { |
|
533 | 533 | throw new \Exception(sprintf('component[%s] already exists.', $id)); |
534 | 534 | } |
535 | 535 | $component[$id] = []; |
@@ -588,7 +588,7 @@ discard block |
||
588 | 588 | protected function clean($file, $plugin, $template, $css) |
589 | 589 | { |
590 | 590 | // delete theme class file |
591 | - if(is_writable(base_path($file))) { |
|
591 | + if (is_writable(base_path($file))) { |
|
592 | 592 | $this->files->delete(base_path($file)); |
593 | 593 | } |
594 | 594 | |
@@ -596,19 +596,19 @@ discard block |
||
596 | 596 | |
597 | 597 | // unregister component from composer.json |
598 | 598 | $composerFile = $pluginEntity->getPath('composer.json'); |
599 | - if($this->originComposerStr !== null && is_writable($composerFile)) { |
|
599 | + if ($this->originComposerStr !== null && is_writable($composerFile)) { |
|
600 | 600 | $this->files->put($composerFile, $this->originComposerStr); |
601 | 601 | } |
602 | 602 | |
603 | 603 | // delete template file |
604 | 604 | $templateFile = $pluginEntity->getPath($template); |
605 | - if(is_writable($templateFile)) { |
|
605 | + if (is_writable($templateFile)) { |
|
606 | 606 | $this->files->delete($templateFile); |
607 | 607 | } |
608 | 608 | |
609 | 609 | // delete css file |
610 | 610 | $cssFile = $pluginEntity->getPath($css); |
611 | - if(is_writable($cssFile)) { |
|
611 | + if (is_writable($cssFile)) { |
|
612 | 612 | $this->files->delete($cssFile); |
613 | 613 | } |
614 | 614 | } |