@@ -36,15 +36,15 @@ |
||
36 | 36 | public function run($app) |
37 | 37 | { |
38 | 38 | foreach ($app->getApplicationModules() as $id => $module) { |
39 | - $folder = $module->basePath . DIRECTORY_SEPARATOR . 'commands'; |
|
39 | + $folder = $module->basePath.DIRECTORY_SEPARATOR.'commands'; |
|
40 | 40 | if (file_exists($folder) && is_dir($folder)) { |
41 | 41 | foreach (FileHelper::findFiles($folder) as $file) { |
42 | 42 | |
43 | - $module->controllerNamespace = $module->namespace . '\commands'; |
|
43 | + $module->controllerNamespace = $module->namespace.'\commands'; |
|
44 | 44 | |
45 | - $className = '\\'.$module->getNamespace().'\\commands\\' . pathinfo($file, PATHINFO_FILENAME); |
|
45 | + $className = '\\'.$module->getNamespace().'\\commands\\'.pathinfo($file, PATHINFO_FILENAME); |
|
46 | 46 | |
47 | - $command = str_replace('-controller', '', $module->id . '/' . Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME))); |
|
47 | + $command = str_replace('-controller', '', $module->id.'/'.Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME))); |
|
48 | 48 | |
49 | 49 | Yii::$app->controllerMap[$command] = ['class' => $className]; |
50 | 50 | } |
@@ -164,18 +164,18 @@ |
||
164 | 164 | } |
165 | 165 | |
166 | 166 | foreach ($this->getLog() as $section => $value) { |
167 | - $this->outputInfo(PHP_EOL . $section . ":"); |
|
167 | + $this->outputInfo(PHP_EOL.$section.":"); |
|
168 | 168 | foreach ($value as $k => $v) { |
169 | 169 | if (is_array($v)) { |
170 | 170 | foreach ($v as $kk => $kv) { |
171 | 171 | if (is_array($kv)) { |
172 | - $this->output(" - {$kk}: " . print_r($kv, true)); |
|
172 | + $this->output(" - {$kk}: ".print_r($kv, true)); |
|
173 | 173 | } else { |
174 | 174 | $this->output(" - {$kk}: {$kv}"); |
175 | 175 | } |
176 | 176 | } |
177 | 177 | } else { |
178 | - $this->output(" - " . $v); |
|
178 | + $this->output(" - ".$v); |
|
179 | 179 | } |
180 | 180 | } |
181 | 181 | } |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | |
206 | 206 | return [ |
207 | 207 | 'module' => $this->module->id, |
208 | - 'route' => $this->module->id . '/' . $request['route'], |
|
208 | + 'route' => $this->module->id.'/'.$request['route'], |
|
209 | 209 | 'params' => $request['args'], |
210 | 210 | ]; |
211 | 211 | } |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | throw new NotFoundHttpException(sprintf("Unable to create controller '%s' for module '%s'.", $requestRoute['route'], $this->module->id)); |
227 | 227 | } |
228 | 228 | |
229 | - Yii::info('LUYA module run module "'.$this->module->id.'" route ' . $requestRoute['route'], __METHOD__); |
|
229 | + Yii::info('LUYA module run module "'.$this->module->id.'" route '.$requestRoute['route'], __METHOD__); |
|
230 | 230 | |
231 | 231 | $this->controller = $controller[0]; |
232 | 232 |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace luya\base; |
4 | 4 | |
5 | 5 | use yii; |
6 | - |
|
7 | 6 | use luya\helpers\FileHelper; |
8 | 7 | use yii\helpers\Inflector; |
9 | 8 | use luya\console\interfaces\ImportControllerInterface; |
@@ -245,7 +245,7 @@ |
||
245 | 245 | */ |
246 | 246 | public function getControllerPath() |
247 | 247 | { |
248 | - return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false); |
|
248 | + return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false); |
|
249 | 249 | } |
250 | 250 | |
251 | 251 | // STATIC METHODS |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | public static function search(array $array, $searchText, $sensitive = false) |
97 | 97 | { |
98 | 98 | $function = ($sensitive) ? 'strpos' : 'stripos'; |
99 | - return array_filter($array, function ($item) use ($searchText, $function) { |
|
99 | + return array_filter($array, function($item) use ($searchText, $function) { |
|
100 | 100 | $response = false; |
101 | 101 | foreach ($item as $key => $value) { |
102 | 102 | if ($response) { |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | { |
139 | 139 | $columns = array_column($array, $column); |
140 | 140 | $key = array_search($search, $columns); |
141 | - return ($key !== false) ? $array[$key] : false; |
|
141 | + return ($key !== false) ? $array[$key] : false; |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | /** |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | */ |
169 | 169 | public static function searchColumns(array $array, $column, $search) |
170 | 170 | { |
171 | - $keys = array_filter($array, function ($var) use ($column, $search) { |
|
171 | + $keys = array_filter($array, function($var) use ($column, $search) { |
|
172 | 172 | return strcasecmp($search, $var[$column]) == 0 ? true : false; |
173 | 173 | }); |
174 | 174 | |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | $array = array_combine($range, $range); |
209 | 209 | |
210 | 210 | if ($text) { |
211 | - array_walk($array, function (&$item, $key) use ($text) { |
|
211 | + array_walk($array, function(&$item, $key) use ($text) { |
|
212 | 212 | if (is_array($text)) { |
213 | 213 | list($singular, $plural) = $text; |
214 | 214 | if ($key == 1) { |
@@ -263,6 +263,6 @@ |
||
263 | 263 | public function render($file, array $args = []) |
264 | 264 | { |
265 | 265 | $view = new View(); |
266 | - return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . FileHelper::ensureExtension($file, 'php'), $args); |
|
266 | + return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.FileHelper::ensureExtension($file, 'php'), $args); |
|
267 | 267 | } |
268 | 268 | } |
@@ -67,7 +67,7 @@ |
||
67 | 67 | { |
68 | 68 | if (Yii::$app->request->isPost) { |
69 | 69 | if ($this->getElapsedProcessTime() < $this->delay) { |
70 | - throw new InvalidCallException("Robots Filter has detected an invalid Request: " . VarDumper::export(Yii::$app->request->post())); |
|
70 | + throw new InvalidCallException("Robots Filter has detected an invalid Request: ".VarDumper::export(Yii::$app->request->post())); |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | /** |
36 | 36 | * |
37 | 37 | * @param array $contentRows |
38 | - * @param unknown $delimiter |
|
38 | + * @param string $delimiter |
|
39 | 39 | * @param unknown $keys |
40 | 40 | * @param string $generateHeader |
41 | 41 | * @return string |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * |
97 | 97 | * @param array $row |
98 | 98 | * @param unknown $delimiter |
99 | - * @param unknown $enclose |
|
99 | + * @param string $enclose |
|
100 | 100 | * @return string |
101 | 101 | */ |
102 | 102 | protected static function generateRow(array $row, $delimiter, $enclose) |
@@ -83,10 +83,10 @@ discard block |
||
83 | 83 | |
84 | 84 | $output = null; |
85 | 85 | if ($generateHeader) { |
86 | - $output.= self::generateRow($header, $delimiter, '"'); |
|
86 | + $output .= self::generateRow($header, $delimiter, '"'); |
|
87 | 87 | } |
88 | 88 | foreach ($rows as $row) { |
89 | - $output.= self::generateRow($row, $delimiter, '"'); |
|
89 | + $output .= self::generateRow($row, $delimiter, '"'); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | return $output; |
@@ -101,10 +101,10 @@ discard block |
||
101 | 101 | */ |
102 | 102 | protected static function generateRow(array $row, $delimiter, $enclose) |
103 | 103 | { |
104 | - array_walk($row, function (&$item) use ($enclose) { |
|
104 | + array_walk($row, function(&$item) use ($enclose) { |
|
105 | 105 | $item = $enclose.Html::encode($item).$enclose; |
106 | 106 | }); |
107 | 107 | |
108 | - return implode($delimiter, $row) . PHP_EOL; |
|
108 | + return implode($delimiter, $row).PHP_EOL; |
|
109 | 109 | } |
110 | 110 | } |
@@ -56,7 +56,7 @@ |
||
56 | 56 | |
57 | 57 | $migrationPath = $this->migrationPath[$module]; |
58 | 58 | |
59 | - $file = $migrationPath . DIRECTORY_SEPARATOR . $className . '.php'; |
|
59 | + $file = $migrationPath.DIRECTORY_SEPARATOR.$className.'.php'; |
|
60 | 60 | if ($this->confirm("Create new migration '$file'?")) { |
61 | 61 | $content = $this->generateMigrationSourceCode([ |
62 | 62 | 'name' => $name, |