@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Yii; |
| 6 | 6 | use yii\helpers\FileHelper; |
| 7 | - |
|
| 8 | 7 | use yii\imagine\Image; |
| 9 | 8 | |
| 10 | 9 | /** |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace luya\web; |
| 4 | 4 | |
| 5 | 5 | use Yii; |
| 6 | - |
|
| 7 | 6 | use yii\web\BadRequestHttpException; |
| 8 | 7 | |
| 9 | 8 | /** |
@@ -80,33 +80,33 @@ |
||
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 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. 0 means never expire. |
|
| 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 | - */ |
|
| 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. 0 means never expire. |
|
| 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) { |
@@ -234,7 +234,7 @@ |
||
| 234 | 234 | $files[$this->fileToName($staticPath, $file)] = $file; |
| 235 | 235 | } |
| 236 | 236 | } catch (InvalidParamException $e) { |
| 237 | - // catch if folder not found. |
|
| 237 | + // catch if folder not found. |
|
| 238 | 238 | } |
| 239 | 239 | }; |
| 240 | 240 | |
@@ -154,11 +154,11 @@ discard block |
||
| 154 | 154 | public function actionUpdate() |
| 155 | 155 | { |
| 156 | 156 | foreach ($this->repos as $repo) { |
| 157 | - $this->rebaseRepo($repo, $this->getFilesystemRepoPath($repo)); |
|
| 157 | + $this->rebaseRepo($repo, $this->getFilesystemRepoPath($repo)); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | foreach ($this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []) as $repo => $path) { |
| 161 | - $this->rebaseRepo($repo, $path); |
|
| 161 | + $this->rebaseRepo($repo, $path); |
|
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | 164 | |
@@ -170,17 +170,17 @@ discard block |
||
| 170 | 170 | */ |
| 171 | 171 | public function actionClone($vendor = null, $repo = null) |
| 172 | 172 | { |
| 173 | - // if `vendor/repo` notation is provided |
|
| 174 | - if ($vendor !== null && strpos($vendor, '/')) { |
|
| 175 | - list($vendor, $repo) = explode("/", $vendor); |
|
| 176 | - } |
|
| 173 | + // if `vendor/repo` notation is provided |
|
| 174 | + if ($vendor !== null && strpos($vendor, '/')) { |
|
| 175 | + list($vendor, $repo) = explode("/", $vendor); |
|
| 176 | + } |
|
| 177 | 177 | |
| 178 | 178 | if (empty($vendor)) { |
| 179 | 179 | $vendor = $this->prompt("Enter the username/vendor for this repo (e.g. luyadev)"); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | if (empty($repo)) { |
| 183 | - $repo = $this->prompt("Enter the name of the repo you like to clone (e.g. luya-module-news)"); |
|
| 183 | + $repo = $this->prompt("Enter the name of the repo you like to clone (e.g. luya-module-news)"); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | $clones = $this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []); |
@@ -201,14 +201,14 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | public function actionRemove($repo) |
| 203 | 203 | { |
| 204 | - FileHelper::removeDirectory($this->getFilesystemRepoPath($repo)); |
|
| 205 | - $clones = $this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []); |
|
| 206 | - if (isset($clones[$repo])) { |
|
| 207 | - unset($clones[$repo]); |
|
| 208 | - $this->saveConfig(self::CONFIG_VAR_CUSTOMCLONES, $clones); |
|
| 209 | - } |
|
| 204 | + FileHelper::removeDirectory($this->getFilesystemRepoPath($repo)); |
|
| 205 | + $clones = $this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []); |
|
| 206 | + if (isset($clones[$repo])) { |
|
| 207 | + unset($clones[$repo]); |
|
| 208 | + $this->saveConfig(self::CONFIG_VAR_CUSTOMCLONES, $clones); |
|
| 209 | + } |
|
| 210 | 210 | |
| 211 | - return $this->outputSuccess("Removed repo {$repo}."); |
|
| 211 | + return $this->outputSuccess("Removed repo {$repo}."); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | private $_gitWrapper; |
@@ -296,16 +296,16 @@ discard block |
||
| 296 | 296 | */ |
| 297 | 297 | private function rebaseRepo($repo, $repoFileSystemPath) |
| 298 | 298 | { |
| 299 | - $wrapper = new GitWrapper(); |
|
| 299 | + $wrapper = new GitWrapper(); |
|
| 300 | 300 | |
| 301 | - $wrapper->git('checkout master', $repoFileSystemPath); |
|
| 302 | - $this->outputInfo("{$repo}: checkout master ✔"); |
|
| 301 | + $wrapper->git('checkout master', $repoFileSystemPath); |
|
| 302 | + $this->outputInfo("{$repo}: checkout master ✔"); |
|
| 303 | 303 | |
| 304 | - $wrapper->git('fetch upstream', $repoFileSystemPath); |
|
| 305 | - $this->outputInfo("{$repo}: fetch upstream ✔"); |
|
| 304 | + $wrapper->git('fetch upstream', $repoFileSystemPath); |
|
| 305 | + $this->outputInfo("{$repo}: fetch upstream ✔"); |
|
| 306 | 306 | |
| 307 | - $wrapper->git('rebase upstream/master master', $repoFileSystemPath); |
|
| 308 | - $this->outputInfo("{$repo}: rebase master ✔"); |
|
| 307 | + $wrapper->git('rebase upstream/master master', $repoFileSystemPath); |
|
| 308 | + $this->outputInfo("{$repo}: rebase master ✔"); |
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | /** |