@@ -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) { |
@@ -6,9 +6,9 @@ |
||
| 6 | 6 | |
| 7 | 7 | class PackageConfig extends Object |
| 8 | 8 | { |
| 9 | - public $bootstrap = []; |
|
| 9 | + public $bootstrap = []; |
|
| 10 | 10 | |
| 11 | - public $blocks = []; |
|
| 11 | + public $blocks = []; |
|
| 12 | 12 | |
| 13 | - public $package; |
|
| 13 | + public $package; |
|
| 14 | 14 | } |
| 15 | 15 | \ No newline at end of file |
@@ -6,36 +6,36 @@ |
||
| 6 | 6 | |
| 7 | 7 | class PackageInstaller extends Object |
| 8 | 8 | { |
| 9 | - private $_timestamp; |
|
| 9 | + private $_timestamp; |
|
| 10 | 10 | |
| 11 | - public function setTimestamp($timestamp) |
|
| 12 | - { |
|
| 13 | - $this->_timestamp = $timestamp; |
|
| 14 | - } |
|
| 11 | + public function setTimestamp($timestamp) |
|
| 12 | + { |
|
| 13 | + $this->_timestamp = $timestamp; |
|
| 14 | + } |
|
| 15 | 15 | |
| 16 | - public function getTimestamp() |
|
| 17 | - { |
|
| 18 | - return $this->_timestamp; |
|
| 19 | - } |
|
| 16 | + public function getTimestamp() |
|
| 17 | + { |
|
| 18 | + return $this->_timestamp; |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - private $_configs = []; |
|
| 21 | + private $_configs = []; |
|
| 22 | 22 | |
| 23 | - public function setConfigs(array $configs) |
|
| 24 | - { |
|
| 25 | - $objects = []; |
|
| 26 | - foreach ($configs as $key => $config) { |
|
| 27 | - $objects[$key] = new PackageConfig($config); |
|
| 28 | - } |
|
| 23 | + public function setConfigs(array $configs) |
|
| 24 | + { |
|
| 25 | + $objects = []; |
|
| 26 | + foreach ($configs as $key => $config) { |
|
| 27 | + $objects[$key] = new PackageConfig($config); |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | - $this->_configs = $objects; |
|
| 31 | - } |
|
| 30 | + $this->_configs = $objects; |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * |
|
| 35 | - * @return \luya\base\PackageConfig |
|
| 36 | - */ |
|
| 37 | - public function getConfigs() |
|
| 38 | - { |
|
| 39 | - return $this->_configs; |
|
| 40 | - } |
|
| 33 | + /** |
|
| 34 | + * |
|
| 35 | + * @return \luya\base\PackageConfig |
|
| 36 | + */ |
|
| 37 | + public function getConfigs() |
|
| 38 | + { |
|
| 39 | + return $this->_configs; |
|
| 40 | + } |
|
| 41 | 41 | } |
| 42 | 42 | \ No newline at end of file |
@@ -130,14 +130,14 @@ 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 | - $data = []; |
|
| 136 | - if (is_file($file)) { |
|
| 137 | - $data = require($file); |
|
| 138 | - } |
|
| 135 | + $data = []; |
|
| 136 | + if (is_file($file)) { |
|
| 137 | + $data = require($file); |
|
| 138 | + } |
|
| 139 | 139 | |
| 140 | - return new PackageInstaller($data); |
|
| 140 | + return new PackageInstaller($data); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -145,11 +145,11 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | protected function bootstrap() |
| 147 | 147 | { |
| 148 | - foreach ($this->getPackageInstaller()->getConfigs() as $config) { |
|
| 149 | - $this->bootstrap = array_merge($this->bootstrap, $config->bootstrap); |
|
| 150 | - } |
|
| 148 | + foreach ($this->getPackageInstaller()->getConfigs() as $config) { |
|
| 149 | + $this->bootstrap = array_merge($this->bootstrap, $config->bootstrap); |
|
| 150 | + } |
|
| 151 | 151 | |
| 152 | - parent::bootstrap(); |
|
| 152 | + parent::bootstrap(); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | /** |
@@ -72,33 +72,33 @@ |
||
| 72 | 72 | */ |
| 73 | 73 | public static function classInfo($file) |
| 74 | 74 | { |
| 75 | - if (!is_file($file)) { |
|
| 76 | - return false; |
|
| 77 | - } |
|
| 75 | + if (!is_file($file)) { |
|
| 76 | + return false; |
|
| 77 | + } |
|
| 78 | 78 | |
| 79 | - $phpCode = file_get_contents($file); |
|
| 80 | - $namespace = null; |
|
| 79 | + $phpCode = file_get_contents($file); |
|
| 80 | + $namespace = null; |
|
| 81 | 81 | |
| 82 | - if (preg_match('#^namespace\s+(.+?);$#sm', $phpCode, $m)) { |
|
| 83 | - $namespace = $m[1]; |
|
| 84 | - } |
|
| 82 | + if (preg_match('#^namespace\s+(.+?);$#sm', $phpCode, $m)) { |
|
| 83 | + $namespace = $m[1]; |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | - $classes = self::classNameByTokens($phpCode); |
|
| 86 | + $classes = self::classNameByTokens($phpCode); |
|
| 87 | 87 | |
| 88 | - return ['namespace' => $namespace, 'class' => end($classes)]; |
|
| 88 | + return ['namespace' => $namespace, 'class' => end($classes)]; |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | private static function classNameByTokens($phpCode) |
| 92 | 92 | { |
| 93 | - $classes = []; |
|
| 94 | - $tokens = token_get_all($phpCode); |
|
| 95 | - $count = count($tokens); |
|
| 96 | - for ($i = 2; $i < $count; $i++) { |
|
| 97 | - if ($tokens[$i - 2][0] == T_CLASS && $tokens[$i - 1][0] == T_WHITESPACE && $tokens[$i][0] == T_STRING) { |
|
| 98 | - $classes[] = $tokens[$i][1]; |
|
| 99 | - } |
|
| 100 | - } |
|
| 101 | - return $classes; |
|
| 93 | + $classes = []; |
|
| 94 | + $tokens = token_get_all($phpCode); |
|
| 95 | + $count = count($tokens); |
|
| 96 | + for ($i = 2; $i < $count; $i++) { |
|
| 97 | + if ($tokens[$i - 2][0] == T_CLASS && $tokens[$i - 1][0] == T_WHITESPACE && $tokens[$i][0] == T_STRING) { |
|
| 98 | + $classes[] = $tokens[$i][1]; |
|
| 99 | + } |
|
| 100 | + } |
|
| 101 | + return $classes; |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | /** |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | |
| 65 | 65 | public function getBaseYiiFile() |
| 66 | 66 | { |
| 67 | - return $this->_baseYiiFile; |
|
| 67 | + return $this->_baseYiiFile; |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |