@@ -36,15 +36,15 @@ |
||
36 | 36 | public function run($app) |
37 | 37 | { |
38 | 38 | foreach ($app->getApplicationModules() as $id => $module) { |
39 | - $folder = $module->basePath . DIRECTORY_SEPARATOR . 'commands'; |
|
39 | + $folder = $module->basePath.DIRECTORY_SEPARATOR.'commands'; |
|
40 | 40 | if (file_exists($folder) && is_dir($folder)) { |
41 | 41 | foreach (FileHelper::findFiles($folder) as $file) { |
42 | 42 | |
43 | - $module->controllerNamespace = $module->namespace . '\commands'; |
|
43 | + $module->controllerNamespace = $module->namespace.'\commands'; |
|
44 | 44 | |
45 | - $className = '\\'.$module->getNamespace().'\\commands\\' . pathinfo($file, PATHINFO_FILENAME); |
|
45 | + $className = '\\'.$module->getNamespace().'\\commands\\'.pathinfo($file, PATHINFO_FILENAME); |
|
46 | 46 | |
47 | - $command = str_replace('-controller', '', $module->id . '/' . Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME))); |
|
47 | + $command = str_replace('-controller', '', $module->id.'/'.Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME))); |
|
48 | 48 | |
49 | 49 | Yii::$app->controllerMap[$command] = ['class' => $className]; |
50 | 50 | } |
@@ -56,7 +56,7 @@ |
||
56 | 56 | |
57 | 57 | $migrationPath = $this->migrationPath[$module]; |
58 | 58 | |
59 | - $file = $migrationPath . DIRECTORY_SEPARATOR . $className . '.php'; |
|
59 | + $file = $migrationPath.DIRECTORY_SEPARATOR.$className.'.php'; |
|
60 | 60 | if ($this->confirm("Create new migration '$file'?")) { |
61 | 61 | $content = $this->generateMigrationSourceCode([ |
62 | 62 | 'name' => $name, |
@@ -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 |
@@ -179,7 +179,7 @@ |
||
179 | 179 | * will auto alias encode by Yii::getAlias function. |
180 | 180 | * |
181 | 181 | * @param string $fileName The path to the file to get the content |
182 | - * @return string|boolean |
|
182 | + * @return string|false |
|
183 | 183 | */ |
184 | 184 | public static function getFileContent($fileName) |
185 | 185 | { |
@@ -245,7 +245,7 @@ |
||
245 | 245 | */ |
246 | 246 | public function getControllerPath() |
247 | 247 | { |
248 | - return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false); |
|
248 | + return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false); |
|
249 | 249 | } |
250 | 250 | |
251 | 251 | // STATIC METHODS |
@@ -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 | } |
@@ -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; |
@@ -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) |