@@ -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; |
@@ -193,6 +193,7 @@ discard block |
||
| 193 | 193 | |
| 194 | 194 | /** |
| 195 | 195 | * @param int $maximumAttendeeCapacity |
| 196 | + * @return void |
|
| 196 | 197 | */ |
| 197 | 198 | public function setMaximumAttendeeCapacity($maximumAttendeeCapacity); |
| 198 | 199 | |
@@ -302,6 +303,7 @@ discard block |
||
| 302 | 303 | |
| 303 | 304 | /** |
| 304 | 305 | * @param Event $subEvent |
| 306 | + * @return void |
|
| 305 | 307 | */ |
| 306 | 308 | public function setSubEvent($subEvent); |
| 307 | 309 | |
@@ -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 | } |
@@ -85,10 +85,10 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | $output = null; |
| 87 | 87 | if ($generateHeader) { |
| 88 | - $output.= self::generateRow($header, $delimiter, '"'); |
|
| 88 | + $output .= self::generateRow($header, $delimiter, '"'); |
|
| 89 | 89 | } |
| 90 | 90 | foreach ($rows as $row) { |
| 91 | - $output.= self::generateRow($row, $delimiter, '"'); |
|
| 91 | + $output .= self::generateRow($row, $delimiter, '"'); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | return $output; |
@@ -104,13 +104,13 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | protected static function generateRow(array $row, $delimiter, $enclose) |
| 106 | 106 | { |
| 107 | - array_walk($row, function (&$item) use ($enclose) { |
|
| 107 | + array_walk($row, function(&$item) use ($enclose) { |
|
| 108 | 108 | if (!is_scalar($item)) { |
| 109 | 109 | $item = "array"; |
| 110 | 110 | } |
| 111 | 111 | $item = $enclose.Html::encode($item).$enclose; |
| 112 | 112 | }); |
| 113 | 113 | |
| 114 | - return implode($delimiter, $row) . PHP_EOL; |
|
| 114 | + return implode($delimiter, $row).PHP_EOL; |
|
| 115 | 115 | } |
| 116 | 116 | } |
@@ -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) |
@@ -203,7 +203,7 @@ |
||
| 203 | 203 | * @param string $repo |
| 204 | 204 | * @param string $isFork |
| 205 | 205 | * @param string $exists |
| 206 | - * @return array |
|
| 206 | + * @return string[] |
|
| 207 | 207 | */ |
| 208 | 208 | private function summaryItem($repo, $isFork, $exists) |
| 209 | 209 | { |
@@ -154,11 +154,11 @@ discard block |
||
| 154 | 154 | public function actionUpdate() |
| 155 | 155 | { |
| 156 | 156 | foreach ($this->repos as $repo) { |
| 157 | - $this->rebaseRepo($repo, $this->getFilesystemRepoPath($repo)); |
|
| 157 | + $this->rebaseRepo($repo, $this->getFilesystemRepoPath($repo)); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | foreach ($this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []) as $repo => $path) { |
| 161 | - $this->rebaseRepo($repo, $path); |
|
| 161 | + $this->rebaseRepo($repo, $path); |
|
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | 164 | |
@@ -170,17 +170,17 @@ discard block |
||
| 170 | 170 | */ |
| 171 | 171 | public function actionClone($vendor = null, $repo = null) |
| 172 | 172 | { |
| 173 | - // if `vendor/repo` notation is provided |
|
| 174 | - if ($vendor !== null && strpos($vendor, '/')) { |
|
| 175 | - list($vendor, $repo) = explode("/", $vendor); |
|
| 176 | - } |
|
| 173 | + // if `vendor/repo` notation is provided |
|
| 174 | + if ($vendor !== null && strpos($vendor, '/')) { |
|
| 175 | + list($vendor, $repo) = explode("/", $vendor); |
|
| 176 | + } |
|
| 177 | 177 | |
| 178 | 178 | if (empty($vendor)) { |
| 179 | 179 | $vendor = $this->prompt("Enter the username/vendor for this repo (e.g. luyadev)"); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | if (empty($repo)) { |
| 183 | - $repo = $this->prompt("Enter the name of the repo you like to clone (e.g. luya-module-news)"); |
|
| 183 | + $repo = $this->prompt("Enter the name of the repo you like to clone (e.g. luya-module-news)"); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | $clones = $this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []); |
@@ -201,14 +201,14 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | public function actionRemove($repo) |
| 203 | 203 | { |
| 204 | - FileHelper::removeDirectory($this->getFilesystemRepoPath($repo)); |
|
| 205 | - $clones = $this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []); |
|
| 206 | - if (isset($clones[$repo])) { |
|
| 207 | - unset($clones[$repo]); |
|
| 208 | - $this->saveConfig(self::CONFIG_VAR_CUSTOMCLONES, $clones); |
|
| 209 | - } |
|
| 204 | + FileHelper::removeDirectory($this->getFilesystemRepoPath($repo)); |
|
| 205 | + $clones = $this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []); |
|
| 206 | + if (isset($clones[$repo])) { |
|
| 207 | + unset($clones[$repo]); |
|
| 208 | + $this->saveConfig(self::CONFIG_VAR_CUSTOMCLONES, $clones); |
|
| 209 | + } |
|
| 210 | 210 | |
| 211 | - return $this->outputSuccess("Removed repo {$repo}."); |
|
| 211 | + return $this->outputSuccess("Removed repo {$repo}."); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | private $_gitWrapper; |
@@ -296,16 +296,16 @@ discard block |
||
| 296 | 296 | */ |
| 297 | 297 | private function rebaseRepo($repo, $repoFileSystemPath) |
| 298 | 298 | { |
| 299 | - $wrapper = new GitWrapper(); |
|
| 299 | + $wrapper = new GitWrapper(); |
|
| 300 | 300 | |
| 301 | - $wrapper->git('checkout master', $repoFileSystemPath); |
|
| 302 | - $this->outputInfo("{$repo}: checkout master ✔"); |
|
| 301 | + $wrapper->git('checkout master', $repoFileSystemPath); |
|
| 302 | + $this->outputInfo("{$repo}: checkout master ✔"); |
|
| 303 | 303 | |
| 304 | - $wrapper->git('fetch upstream', $repoFileSystemPath); |
|
| 305 | - $this->outputInfo("{$repo}: fetch upstream ✔"); |
|
| 304 | + $wrapper->git('fetch upstream', $repoFileSystemPath); |
|
| 305 | + $this->outputInfo("{$repo}: fetch upstream ✔"); |
|
| 306 | 306 | |
| 307 | - $wrapper->git('rebase upstream/master master', $repoFileSystemPath); |
|
| 308 | - $this->outputInfo("{$repo}: rebase master ✔"); |
|
| 307 | + $wrapper->git('rebase upstream/master master', $repoFileSystemPath); |
|
| 308 | + $this->outputInfo("{$repo}: rebase master ✔"); |
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | /** |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | // generate summary overview |
| 98 | 98 | foreach ($this->repos as $repo) { |
| 99 | 99 | $newRepoHome = $this->getFilesystemRepoPath($repo); |
| 100 | - if (file_exists($newRepoHome . DIRECTORY_SEPARATOR . '.git')) { |
|
| 100 | + if (file_exists($newRepoHome.DIRECTORY_SEPARATOR.'.git')) { |
|
| 101 | 101 | $summary[] = $this->summaryItem($repo, false, true); |
| 102 | 102 | } elseif ($this->forkExists($username, $repo)) { |
| 103 | 103 | $summary[] = $this->summaryItem($repo, true, false); |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | */ |
| 246 | 246 | private function getFilesystemRepoPath($repo) |
| 247 | 247 | { |
| 248 | - return 'repos' . DIRECTORY_SEPARATOR . $repo; |
|
| 248 | + return 'repos'.DIRECTORY_SEPARATOR.$repo; |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /** |
@@ -241,6 +241,9 @@ |
||
| 241 | 241 | return $files; |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | + /** |
|
| 245 | + * @param string $prefix |
|
| 246 | + */ |
|
| 244 | 247 | private function fileToName($prefix, $file) |
| 245 | 248 | { |
| 246 | 249 | $value = ltrim(str_replace([$prefix, 'Controller.php'], '', $file), DIRECTORY_SEPARATOR); |
@@ -234,7 +234,7 @@ |
||
| 234 | 234 | $files[$this->fileToName($staticPath, $file)] = $file; |
| 235 | 235 | } |
| 236 | 236 | } catch (InvalidParamException $e) { |
| 237 | - // catch if folder not found. |
|
| 237 | + // catch if folder not found. |
|
| 238 | 238 | } |
| 239 | 239 | }; |
| 240 | 240 | |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | } catch (InvalidParamException $e) { |
| 231 | 231 | try { |
| 232 | - $staticPath = static::staticBasePath() . DIRECTORY_SEPARATOR . 'controllers'; |
|
| 232 | + $staticPath = static::staticBasePath().DIRECTORY_SEPARATOR.'controllers'; |
|
| 233 | 233 | foreach (FileHelper::findFiles($staticPath) as $file) { |
| 234 | 234 | $files[$this->fileToName($staticPath, $file)] = $file; |
| 235 | 235 | } |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | */ |
| 258 | 258 | public function getControllerPath() |
| 259 | 259 | { |
| 260 | - return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false); |
|
| 260 | + return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false); |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | // STATIC METHODS |