@@ -18,5 +18,5 @@ |
||
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | spl_autoload_register(['Yii', 'autoload'], true, true); |
| 21 | -Yii::$classMap = require(LUYA_YII_VENDOR . '/classes.php'); |
|
| 21 | +Yii::$classMap = require(LUYA_YII_VENDOR.'/classes.php'); |
|
| 22 | 22 | Yii::$container = new yii\di\Container(); |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | case 'en': |
| 116 | 116 | return 'en_US'; |
| 117 | 117 | default: |
| 118 | - return strtolower($lang) . '_' . strtoupper($lang); |
|
| 118 | + return strtolower($lang).'_'.strtoupper($lang); |
|
| 119 | 119 | } |
| 120 | 120 | } |
| 121 | 121 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | public function getWebroot() |
| 146 | 146 | { |
| 147 | 147 | if ($this->_webroot === null) { |
| 148 | - $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory); |
|
| 148 | + $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | return $this->_webroot; |
@@ -79,34 +79,34 @@ |
||
| 79 | 79 | return $this->_cachable; |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - /** |
|
| 83 | - * Method combines both [[setHasCache()]] and [[getHasCache()]] methods to retrieve value identified by a $key, |
|
| 84 | - * or to store the result of $closure execution if there is no cache available for the $key. |
|
| 85 | - * |
|
| 86 | - * Usage example: |
|
| 87 | - * |
|
| 88 | - * ```php |
|
| 89 | - * use CacheableTrait; |
|
| 90 | - * |
|
| 91 | - * public function getTopProducts($count = 10) |
|
| 92 | - * { |
|
| 93 | - * return $this->getOrSetHasCache(['top-n-products', 'n' => $count], function ($cache) use ($count) { |
|
| 94 | - * return Products::find()->mostPopular()->limit(10)->all(); |
|
| 95 | - * }, 1000); |
|
| 96 | - * } |
|
| 97 | - * ``` |
|
| 98 | - * |
|
| 99 | - * @param mixed $key a key identifying the value to be cached. This can be a simple string or |
|
| 100 | - * a complex data structure consisting of factors representing the key. |
|
| 101 | - * @param \Closure $closure the closure that will be used to generate a value to be cached. |
|
| 102 | - * In case $closure returns `false`, the value will not be cached. |
|
| 103 | - * @param int $duration default duration in seconds before the cache will expire. If not set, |
|
| 104 | - * [[defaultDuration]] value will be used. |
|
| 105 | - * @param Dependency $dependency dependency of the cached item. If the dependency changes, |
|
| 106 | - * the corresponding value in the cache will be invalidated when it is fetched via [[get()]]. |
|
| 107 | - * This parameter is ignored if [[serializer]] is `false`. |
|
| 108 | - * @return mixed result of $closure execution |
|
| 109 | - */ |
|
| 82 | + /** |
|
| 83 | + * Method combines both [[setHasCache()]] and [[getHasCache()]] methods to retrieve value identified by a $key, |
|
| 84 | + * or to store the result of $closure execution if there is no cache available for the $key. |
|
| 85 | + * |
|
| 86 | + * Usage example: |
|
| 87 | + * |
|
| 88 | + * ```php |
|
| 89 | + * use CacheableTrait; |
|
| 90 | + * |
|
| 91 | + * public function getTopProducts($count = 10) |
|
| 92 | + * { |
|
| 93 | + * return $this->getOrSetHasCache(['top-n-products', 'n' => $count], function ($cache) use ($count) { |
|
| 94 | + * return Products::find()->mostPopular()->limit(10)->all(); |
|
| 95 | + * }, 1000); |
|
| 96 | + * } |
|
| 97 | + * ``` |
|
| 98 | + * |
|
| 99 | + * @param mixed $key a key identifying the value to be cached. This can be a simple string or |
|
| 100 | + * a complex data structure consisting of factors representing the key. |
|
| 101 | + * @param \Closure $closure the closure that will be used to generate a value to be cached. |
|
| 102 | + * In case $closure returns `false`, the value will not be cached. |
|
| 103 | + * @param int $duration default duration in seconds before the cache will expire. If not set, |
|
| 104 | + * [[defaultDuration]] value will be used. |
|
| 105 | + * @param Dependency $dependency dependency of the cached item. If the dependency changes, |
|
| 106 | + * the corresponding value in the cache will be invalidated when it is fetched via [[get()]]. |
|
| 107 | + * This parameter is ignored if [[serializer]] is `false`. |
|
| 108 | + * @return mixed result of $closure execution |
|
| 109 | + */ |
|
| 110 | 110 | public function getOrSetHasCache($key, \Closure $closure, $duration = null, $dependency = null) |
| 111 | 111 | { |
| 112 | 112 | if (($value = $this->getHasCache($key)) !== false) { |
@@ -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 | } |
@@ -278,6 +278,6 @@ |
||
| 278 | 278 | */ |
| 279 | 279 | public function getControllerPath() |
| 280 | 280 | { |
| 281 | - return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false); |
|
| 281 | + return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false); |
|
| 282 | 282 | } |
| 283 | 283 | } |
@@ -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; |
@@ -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 | |
@@ -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 | } |