| @@ -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; | 
| @@ -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. | |
| 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) { | 
| @@ -27,22 +27,22 @@ discard block | ||
| 27 | 27 | */ | 
| 28 | 28 | public function resolveGetterMethods() | 
| 29 | 29 |      { | 
| 30 | - $resolved = []; | |
| 31 | - $methods = get_class_methods($this); | |
| 30 | + $resolved = []; | |
| 31 | + $methods = get_class_methods($this); | |
| 32 | 32 | |
| 33 | -    	if (!$methods) { | |
| 34 | - return []; | |
| 35 | - } | |
| 33 | +        if (!$methods) { | |
| 34 | + return []; | |
| 35 | + } | |
| 36 | 36 | |
| 37 | -    	foreach ($methods as $method) { | |
| 38 | -    		if (StringHelper::startsWith($method, 'get', true)) { | |
| 39 | -    			$resolved[] = lcfirst(StringHelper::replaceFirst('get', '', $method)); | |
| 40 | - } | |
| 41 | - } | |
| 37 | +        foreach ($methods as $method) { | |
| 38 | +            if (StringHelper::startsWith($method, 'get', true)) { | |
| 39 | +                $resolved[] = lcfirst(StringHelper::replaceFirst('get', '', $method)); | |
| 40 | + } | |
| 41 | + } | |
| 42 | 42 | |
| 43 | - asort($resolved); | |
| 43 | + asort($resolved); | |
| 44 | 44 | |
| 45 | - return $resolved; | |
| 45 | + return $resolved; | |
| 46 | 46 | } | 
| 47 | 47 | |
| 48 | 48 | /** | 
| @@ -58,7 +58,7 @@ discard block | ||
| 58 | 58 | */ | 
| 59 | 59 | public function fields() | 
| 60 | 60 |      { | 
| 61 | - return $this->resolveGetterMethods(); | |
| 61 | + return $this->resolveGetterMethods(); | |
| 62 | 62 | } | 
| 63 | 63 | |
| 64 | 64 | /** |