@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | $this->apiEndpoint, |
| 432 | 432 | $this->getDbTableShema(), |
| 433 | 433 | $this->enableI18n |
| 434 | - ), |
|
| 434 | + ), |
|
| 435 | 435 | ]; |
| 436 | 436 | |
| 437 | 437 | foreach ($files as $file) { |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | $apiEndpoint, |
| 488 | 488 | Yii::$app->db->getTableSchema($object->tableName(), true), |
| 489 | 489 | $i18n |
| 490 | - ), |
|
| 490 | + ), |
|
| 491 | 491 | ]; |
| 492 | 492 | |
| 493 | 493 | $this->generateFile($data); |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use yii\helpers\Console; |
| 7 | 7 | use yii\helpers\Inflector; |
| 8 | 8 | use yii\db\TableSchema; |
| 9 | -use luya\Boot; |
|
| 10 | 9 | use luya\helpers\FileHelper; |
| 11 | 10 | use luya\admin\ngrest\base\NgRestModelInterface; |
| 12 | 11 | use yii\console\Exception; |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Yii; |
| 6 | 6 | use yii\helpers\FileHelper; |
| 7 | -use yii\helpers\Console; |
|
| 8 | 7 | use yii\imagine\Image; |
| 9 | 8 | |
| 10 | 9 | /** |
@@ -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) { |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use luya\Exception; |
| 7 | 7 | use PHPMailer; |
| 8 | 8 | use SMTP; |
| 9 | -use luya\web\View; |
|
| 10 | 9 | use yii\base\Controller; |
| 11 | 10 | |
| 12 | 11 | /** |
@@ -202,14 +202,14 @@ |
||
| 202 | 202 | */ |
| 203 | 203 | public function getAdminModules() |
| 204 | 204 | { |
| 205 | - $modules = []; |
|
| 205 | + $modules = []; |
|
| 206 | 206 | |
| 207 | - foreach ($this->getModules() as $id => $obj) { |
|
| 208 | - if ($obj instanceof Module && $obj instanceof AdminModuleInterface) { |
|
| 209 | - $modules[$id] = $obj; |
|
| 210 | - } |
|
| 211 | - } |
|
| 207 | + foreach ($this->getModules() as $id => $obj) { |
|
| 208 | + if ($obj instanceof Module && $obj instanceof AdminModuleInterface) { |
|
| 209 | + $modules[$id] = $obj; |
|
| 210 | + } |
|
| 211 | + } |
|
| 212 | 212 | |
| 213 | - return $modules; |
|
| 213 | + return $modules; |
|
| 214 | 214 | } |
| 215 | 215 | } |
@@ -261,7 +261,7 @@ |
||
| 261 | 261 | */ |
| 262 | 262 | public function render($file, array $args = []) |
| 263 | 263 | { |
| 264 | - $view = new View(); |
|
| 264 | + $view = new View(); |
|
| 265 | 265 | return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . FileHelper::ensureExtension($file, 'php'), $args); |
| 266 | 266 | |
| 267 | 267 | } |