@@ -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) { |
@@ -30,10 +30,10 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | trait RestBehaviorsTrait |
| 32 | 32 | { |
| 33 | - /** |
|
| 34 | - * @var boolean Whether CORS is enabled or not. |
|
| 35 | - */ |
|
| 36 | - public $enableCors = false; |
|
| 33 | + /** |
|
| 34 | + * @var boolean Whether CORS is enabled or not. |
|
| 35 | + */ |
|
| 36 | + public $enableCors = false; |
|
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * Whether the rest controller is protected or not. |
@@ -88,12 +88,12 @@ discard block |
||
| 88 | 88 | ]; |
| 89 | 89 | |
| 90 | 90 | if ($this->enableCors) { |
| 91 | - $behaviors['authenticator']['except'] = ['options']; |
|
| 91 | + $behaviors['authenticator']['except'] = ['options']; |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | if ($this->enableCors) { |
| 96 | - $behaviors['cors'] = Cors::class; |
|
| 96 | + $behaviors['cors'] = Cors::class; |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $behaviors['contentNegotiator'] = [ |