@@ -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()); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | { |
| 52 | 52 | $info = pathinfo($file); |
| 53 | 53 | if (!isset($info['extension']) || empty($info['extension'])) { |
| 54 | - $file = rtrim($file, '.') . '.' . $extension; |
|
| 54 | + $file = rtrim($file, '.').'.'.$extension; |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | return $file; |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | 'extension' => (isset($path['extension']) && !empty($path['extension'])) ? mb_strtolower($path['extension'], 'UTF-8') : false, |
| 116 | 116 | 'name' => (isset($path['filename']) && !empty($path['filename'])) ? $path['filename'] : false, |
| 117 | 117 | 'source' => $sourceFile, |
| 118 | - 'sourceFilename' => (isset($path['dirname']) && isset($path['filename'])) ? $path['dirname'] . DIRECTORY_SEPARATOR . $path['filename'] : false, |
|
| 118 | + 'sourceFilename' => (isset($path['dirname']) && isset($path['filename'])) ? $path['dirname'].DIRECTORY_SEPARATOR.$path['filename'] : false, |
|
| 119 | 119 | ]; |
| 120 | 120 | } |
| 121 | 121 | |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | $this->_mailer->isSMTP(); |
| 145 | 145 | $this->_mailer->SMTPSecure = $this->smtpSecure; |
| 146 | 146 | $this->_mailer->Host = $this->host; |
| 147 | - $this->_mailer->SMTPAuth= $this->smtpAuth; |
|
| 147 | + $this->_mailer->SMTPAuth = $this->smtpAuth; |
|
| 148 | 148 | $this->_mailer->Username = $this->username; |
| 149 | 149 | $this->_mailer->Password = $this->password; |
| 150 | 150 | $this->_mailer->Port = $this->port; |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | return true; |
| 483 | 483 | } else { |
| 484 | 484 | $data = [$this->host, $this->port, $this->smtpSecure, $this->username]; |
| 485 | - throw new Exception('Authentication failed ('.implode(',', $data).'): '.$smtp->getLastReply() . PHP_EOL . print_r($smtp->getError(), true)); |
|
| 485 | + throw new Exception('Authentication failed ('.implode(',', $data).'): '.$smtp->getLastReply().PHP_EOL.print_r($smtp->getError(), true)); |
|
| 486 | 486 | } |
| 487 | 487 | } else { |
| 488 | 488 | throw new Exception('HELO failed: '.$smtp->getLastReply()); |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | public function setHref($href) |
| 54 | 54 | { |
| 55 | 55 | if (StringHelper::startsWith($href, '//')) { |
| 56 | - $this->_href = Url::base(true) . str_replace('//', '/', $href); |
|
| 56 | + $this->_href = Url::base(true).str_replace('//', '/', $href); |
|
| 57 | 57 | } else { |
| 58 | 58 | $this->_href = Url::ensureHttp($href); |
| 59 | 59 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | */ |
| 50 | 50 | public function getHref() |
| 51 | 51 | { |
| 52 | - return empty($this->getEmail()) ?: 'mailto:' . $this->getEmail(); |
|
| 52 | + return empty($this->getEmail()) ?: 'mailto:'.$this->getEmail(); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -138,8 +138,8 @@ |
||
| 138 | 138 | protected static function registerView() |
| 139 | 139 | { |
| 140 | 140 | if (self::$_view === null) { |
| 141 | - Yii::$app->view->on(View::EVENT_BEGIN_BODY, function ($event) { |
|
| 142 | - echo '<script type="application/ld+json">' . Json::encode($event->sender->params) . '</script>'; |
|
| 141 | + Yii::$app->view->on(View::EVENT_BEGIN_BODY, function($event) { |
|
| 142 | + echo '<script type="application/ld+json">'.Json::encode($event->sender->params).'</script>'; |
|
| 143 | 143 | }); |
| 144 | 144 | |
| 145 | 145 | self::$_view = true; |
@@ -73,27 +73,27 @@ |
||
| 73 | 73 | public function run() |
| 74 | 74 | { |
| 75 | 75 | // Cache generated code |
| 76 | - return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass], function () { |
|
| 76 | + return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass], function() { |
|
| 77 | 77 | |
| 78 | 78 | // Check if file ends with .svg, if not add the extension |
| 79 | - $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file . '.svg'; |
|
| 79 | + $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file.'.svg'; |
|
| 80 | 80 | |
| 81 | 81 | // Build the full svg file path |
| 82 | - $svgPath = $this->folder . DIRECTORY_SEPARATOR . $svgFile; |
|
| 82 | + $svgPath = $this->folder.DIRECTORY_SEPARATOR.$svgFile; |
|
| 83 | 83 | |
| 84 | 84 | // Get the svg contents |
| 85 | 85 | $content = FileHelper::getFileContent($svgPath); |
| 86 | 86 | |
| 87 | 87 | // If a cssClass string is given, add it to the <svg> tag |
| 88 | 88 | if ($this->cssClass && is_string($this->cssClass)) { |
| 89 | - $content = preg_replace('/<svg/', '<svg class="' . $this->cssClass . '"', $content); |
|
| 89 | + $content = preg_replace('/<svg/', '<svg class="'.$this->cssClass.'"', $content); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | if ($content) { |
| 93 | 93 | return $content; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - throw new Exception('Unable to access SVG File: ' . $svgPath); |
|
| 96 | + throw new Exception('Unable to access SVG File: '.$svgPath); |
|
| 97 | 97 | }); |
| 98 | 98 | } |
| 99 | 99 | } |
@@ -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. 0 means never expire. |
|
| 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. 0 means never expire. |
|
| 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) { |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function actionConfigInfo() |
| 31 | 31 | { |
| 32 | - $this->outputInfo("dev config file: " . Yii::getAlias($this->configFile)); |
|
| 32 | + $this->outputInfo("dev config file: ".Yii::getAlias($this->configFile)); |
|
| 33 | 33 | |
| 34 | 34 | $config = $this->readConfig(); |
| 35 | 35 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $save = FileHelper::writeFile($this->configFile, Json::encode($content)); |
| 92 | 92 | |
| 93 | 93 | if (!$save) { |
| 94 | - return $this->outputError("Unable to find config file " . $this->configFile. ". Please create and provide Permissions."); |
|
| 94 | + return $this->outputError("Unable to find config file ".$this->configFile.". Please create and provide Permissions."); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | return $value; |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | /** |
| 27 | 27 | * Display config data and location. |
| 28 | 28 | * |
| 29 | - * @return boolean|void |
|
| 29 | + * @return integer|null |
|
| 30 | 30 | */ |
| 31 | 31 | public function actionConfigInfo() |
| 32 | 32 | { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * Save a value in the config for a given key. |
| 78 | 78 | * |
| 79 | 79 | * @param string $key |
| 80 | - * @param mixed $value |
|
| 80 | + * @param string|boolean $value |
|
| 81 | 81 | * @return mixed |
| 82 | 82 | */ |
| 83 | 83 | protected function saveConfig($key, $value) |