@@ -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. |
|
| 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. |
|
| 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) { |
@@ -213,14 +213,14 @@ |
||
| 213 | 213 | if (file_exists($this->_baseYiiFile)) { |
| 214 | 214 | defined('LUYA_YII_VENDOR') ?: define('LUYA_YII_VENDOR', dirname($this->_baseYiiFile)); |
| 215 | 215 | |
| 216 | - $baseYiiFolder = LUYA_YII_VENDOR . DIRECTORY_SEPARATOR; |
|
| 217 | - $luyaYiiFile = $this->getCoreBasePath() . DIRECTORY_SEPARATOR . 'Yii.php'; |
|
| 216 | + $baseYiiFolder = LUYA_YII_VENDOR.DIRECTORY_SEPARATOR; |
|
| 217 | + $luyaYiiFile = $this->getCoreBasePath().DIRECTORY_SEPARATOR.'Yii.php'; |
|
| 218 | 218 | |
| 219 | 219 | if (file_exists($luyaYiiFile)) { |
| 220 | - require_once($baseYiiFolder . 'BaseYii.php'); |
|
| 220 | + require_once($baseYiiFolder.'BaseYii.php'); |
|
| 221 | 221 | require_once($luyaYiiFile); |
| 222 | 222 | } else { |
| 223 | - require_once($baseYiiFolder . 'Yii.php'); |
|
| 223 | + require_once($baseYiiFolder.'Yii.php'); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | Yii::setAlias('@luya', $this->getCoreBasePath()); |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | public function isCli() |
| 71 | 71 | { |
| 72 | - return $this->getSapiName() === 'cli'; |
|
| 72 | + return $this->getSapiName() === 'cli'; |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -128,14 +128,14 @@ discard block |
||
| 128 | 128 | { |
| 129 | 129 | if ($this->_configArray === null) { |
| 130 | 130 | if (!file_exists($this->configFile)) { |
| 131 | - if (!$this->isCli()) { |
|
| 132 | - throw new Exception("Unable to load the config file '".$this->configFile."'."); |
|
| 133 | - } |
|
| 131 | + if (!$this->isCli()) { |
|
| 132 | + throw new Exception("Unable to load the config file '".$this->configFile."'."); |
|
| 133 | + } |
|
| 134 | 134 | |
| 135 | - $config = ['id' => 'consoleapp', 'basePath' => dirname(__DIR__)]; |
|
| 135 | + $config = ['id' => 'consoleapp', 'basePath' => dirname(__DIR__)]; |
|
| 136 | 136 | |
| 137 | 137 | } else { |
| 138 | - $config = require $this->configFile; |
|
| 138 | + $config = require $this->configFile; |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | if (!is_array($config)) { |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | case 'en': |
| 105 | 105 | return 'en_US'; |
| 106 | 106 | default: |
| 107 | - return strtolower($lang) . '_' . strtoupper($lang); |
|
| 107 | + return strtolower($lang).'_'.strtoupper($lang); |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | */ |
| 131 | 131 | public function getPackageInstaller() |
| 132 | 132 | { |
| 133 | - $file = Yii::getAlias('@vendor' . DIRECTORY_SEPARATOR . 'luyadev' . DIRECTORY_SEPARATOR . 'installer.php'); |
|
| 133 | + $file = Yii::getAlias('@vendor'.DIRECTORY_SEPARATOR.'luyadev'.DIRECTORY_SEPARATOR.'installer.php'); |
|
| 134 | 134 | |
| 135 | 135 | $data = []; |
| 136 | 136 | if (is_file($file)) { |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | public function getWebroot() |
| 163 | 163 | { |
| 164 | 164 | if ($this->_webroot === null) { |
| 165 | - $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory); |
|
| 165 | + $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | return $this->_webroot; |