@@ -42,6 +42,11 @@ |
||
42 | 42 | } |
43 | 43 | } |
44 | 44 | |
45 | + /** |
|
46 | + * @param string|boolean $module |
|
47 | + * |
|
48 | + * @return string |
|
49 | + */ |
|
45 | 50 | private function getModuleMigrationDirectorie($module) |
46 | 51 | { |
47 | 52 | if (!array_key_exists($module, $this->moduleMigrationDirectories)) { |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | */ |
67 | 67 | protected function createMigration($class) |
68 | 68 | { |
69 | - $orig = $this->migrationPath . DIRECTORY_SEPARATOR . $class . '.php'; |
|
69 | + $orig = $this->migrationPath.DIRECTORY_SEPARATOR.$class.'.php'; |
|
70 | 70 | |
71 | 71 | if (file_exists($orig)) { |
72 | 72 | require_once $orig; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | $module = $this->prompt("Could not find migration class. Please enter the module name who belongs to '$class.':"); |
86 | 86 | $dir = $this->getModuleMigrationDirectorie($module); |
87 | - $file = $dir . DIRECTORY_SEPARATOR . $class . '.php'; |
|
87 | + $file = $dir.DIRECTORY_SEPARATOR.$class.'.php'; |
|
88 | 88 | if (file_exists($file)) { |
89 | 89 | require_once $file; |
90 | 90 | return new $class(); |
@@ -168,7 +168,7 @@ |
||
168 | 168 | return true; |
169 | 169 | } else { |
170 | 170 | $data = [$this->host, $this->port, $this->smtpSecure, $this->username]; |
171 | - throw new Exception('Authentication failed ('.implode(',', $data).'): '.$smtp->getLastReply() . PHP_EOL . print_r($smtp->getError(), true)); |
|
171 | + throw new Exception('Authentication failed ('.implode(',', $data).'): '.$smtp->getLastReply().PHP_EOL.print_r($smtp->getError(), true)); |
|
172 | 172 | } |
173 | 173 | } else { |
174 | 174 | throw new Exception('HELO failed: '.$smtp->getLastReply()); |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use luya\Exception; |
7 | 7 | use PHPMailer; |
8 | 8 | use SMTP; |
9 | - |
|
10 | 9 | use yii\base\Controller; |
11 | 10 | |
12 | 11 | /** |
@@ -41,7 +41,7 @@ |
||
41 | 41 | { |
42 | 42 | $info = pathinfo($file); |
43 | 43 | if (!isset($info['extension']) || empty($info['extension'])) { |
44 | - $file = rtrim($file, '.') . '.' . $extension; |
|
44 | + $file = rtrim($file, '.').'.'.$extension; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | return $file; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | public function verbosePrint($message, $section = null) |
36 | 36 | { |
37 | 37 | if ($this->verbose) { |
38 | - $this->output((!empty($section)) ? $section . ': ' . $message : $message); |
|
38 | + $this->output((!empty($section)) ? $section.': '.$message : $message); |
|
39 | 39 | } |
40 | 40 | } |
41 | 41 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $name = substr($name, 0, -(strlen($suffix))); |
118 | 118 | } |
119 | 119 | |
120 | - return $name . $suffix; |
|
120 | + return $name.$suffix; |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | /** |
@@ -104,7 +104,7 @@ |
||
104 | 104 | public static function ensureHttp($url, $https = false) |
105 | 105 | { |
106 | 106 | if (!preg_match("~^(?:f|ht)tps?://~i", $url)) { |
107 | - $url = ($https ? "https://" : "http://") . $url; |
|
107 | + $url = ($https ? "https://" : "http://").$url; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | return $url; |
@@ -114,9 +114,9 @@ |
||
114 | 114 | $_file = $exception->getFile(); |
115 | 115 | $_line = $exception->getLine(); |
116 | 116 | } elseif (is_string($exception)) { |
117 | - $_message = 'exception string: ' . $exception; |
|
117 | + $_message = 'exception string: '.$exception; |
|
118 | 118 | } elseif (is_array($exception)) { |
119 | - $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: ' . print_r($exception, true); |
|
119 | + $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: '.print_r($exception, true); |
|
120 | 120 | $_file = isset($exception['file']) ? $exception['file'] : __FILE__; |
121 | 121 | $_line = isset($exception['line']) ? $exception['line'] : __LINE__; |
122 | 122 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | public function parse($value, $sub) |
28 | 28 | { |
29 | 29 | if (substr($value, 0, 2) == '//') { |
30 | - $value = StringHelper::replaceFirst('//', Url::base(true) . '/', $value); |
|
30 | + $value = StringHelper::replaceFirst('//', Url::base(true).'/', $value); |
|
31 | 31 | $external = false; |
32 | 32 | } else { |
33 | 33 | $external = true; |
@@ -70,14 +70,14 @@ |
||
70 | 70 | */ |
71 | 71 | public function run() |
72 | 72 | { |
73 | - $class = 'lazy-image ' . $this->extraClass; |
|
73 | + $class = 'lazy-image '.$this->extraClass; |
|
74 | 74 | |
75 | 75 | if ($this->attributesOnly) { |
76 | 76 | return "class=\"{$class}\" data-src=\"$this->src\" data-width=\"$this->width\" data-height=\"$this->height\" data-as-background=\"1\""; |
77 | 77 | } |
78 | 78 | |
79 | 79 | $tag = Html::tag('img', '', ['class' => $class, 'data-src' => $this->src, 'data-width' => $this->width, 'data-height' => $this->height]); |
80 | - $tag.= '<noscript><img class="'.$class.'" src="'.$this->src.'" /></noscript>'; |
|
80 | + $tag .= '<noscript><img class="'.$class.'" src="'.$this->src.'" /></noscript>'; |
|
81 | 81 | return $tag; |
82 | 82 | } |
83 | 83 | } |
@@ -74,10 +74,10 @@ discard block |
||
74 | 74 | } |
75 | 75 | $rules = []; |
76 | 76 | foreach ($types as $type => $columns) { |
77 | - $rules[] = "[['" . implode("', '", $columns) . "'], '$type']"; |
|
77 | + $rules[] = "[['".implode("', '", $columns)."'], '$type']"; |
|
78 | 78 | } |
79 | 79 | foreach ($lengths as $length => $columns) { |
80 | - $rules[] = "[['" . implode("', '", $columns) . "'], 'string', 'max' => $length]"; |
|
80 | + $rules[] = "[['".implode("', '", $columns)."'], 'string', 'max' => $length]"; |
|
81 | 81 | } |
82 | 82 | $db = $this->getDbConnection(); |
83 | 83 | // Unique indexes rules |
@@ -88,12 +88,12 @@ discard block |
||
88 | 88 | if (!$this->isColumnAutoIncremental($table, $uniqueColumns)) { |
89 | 89 | $attributesCount = count($uniqueColumns); |
90 | 90 | if ($attributesCount === 1) { |
91 | - $rules[] = "[['" . $uniqueColumns[0] . "'], 'unique']"; |
|
91 | + $rules[] = "[['".$uniqueColumns[0]."'], 'unique']"; |
|
92 | 92 | } elseif ($attributesCount > 1) { |
93 | 93 | $labels = array_intersect_key($this->generateLabels($table), array_flip($uniqueColumns)); |
94 | 94 | $lastLabel = array_pop($labels); |
95 | 95 | $columnsList = implode("', '", $uniqueColumns); |
96 | - $rules[] = "[['$columnsList'], 'unique', 'targetAttribute' => ['$columnsList'], 'message' => 'The combination of " . implode(', ', $labels) . " and $lastLabel has already been taken.']"; |
|
96 | + $rules[] = "[['$columnsList'], 'unique', 'targetAttribute' => ['$columnsList'], 'message' => 'The combination of ".implode(', ', $labels)." and $lastLabel has already been taken.']"; |
|
97 | 97 | } |
98 | 98 | } |
99 | 99 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | $fullTableName = $tableName; |
137 | 137 | if (($pos = strrpos($tableName, '.')) !== false) { |
138 | 138 | if (($useSchemaName === null && $this->useSchemaName) || $useSchemaName) { |
139 | - $schemaName = substr($tableName, 0, $pos) . '_'; |
|
139 | + $schemaName = substr($tableName, 0, $pos).'_'; |
|
140 | 140 | } |
141 | 141 | $tableName = substr($tableName, $pos + 1); |
142 | 142 | } |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | if (($pos = strrpos($pattern, '.')) !== false) { |
150 | 150 | $pattern = substr($pattern, $pos + 1); |
151 | 151 | } |
152 | - $patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/'; |
|
152 | + $patterns[] = '/^'.str_replace('*', '(\w+)', $pattern).'$/'; |
|
153 | 153 | } |
154 | 154 | $className = $tableName; |
155 | 155 | foreach ($patterns as $pattern) { |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | } else { |
194 | 194 | $label = Inflector::camel2words($column->name); |
195 | 195 | if (!empty($label) && substr_compare($label, ' id', -3, 3, true) === 0) { |
196 | - $label = substr($label, 0, -3) . ' ID'; |
|
196 | + $label = substr($label, 0, -3).' ID'; |
|
197 | 197 | } |
198 | 198 | $labels[$column->name] = $label; |
199 | 199 | } |