@@ -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 | } |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | foreach ($array as $k => $v) { |
51 | 51 | if (is_numeric($v)) { |
52 | 52 | if (is_float($v)) { |
53 | - $return[$k] = (float)$v; |
|
53 | + $return[$k] = (float) $v; |
|
54 | 54 | } else { |
55 | - $return[$k] = (int)$v; |
|
55 | + $return[$k] = (int) $v; |
|
56 | 56 | } |
57 | 57 | } elseif (is_array($v)) { |
58 | 58 | $return[$k] = self::typeCast($v); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | public static function search($array, $searchText, $sensitive = false) |
93 | 93 | { |
94 | 94 | $function = ($sensitive) ? 'strpos' : 'stripos'; |
95 | - return array_filter($array, function ($item) use ($searchText, $function) { |
|
95 | + return array_filter($array, function($item) use ($searchText, $function) { |
|
96 | 96 | $response = false; |
97 | 97 | foreach ($item as $key => $value) { |
98 | 98 | if ($response) { |
@@ -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 | } |
@@ -88,8 +88,8 @@ |
||
88 | 88 | { |
89 | 89 | return [ |
90 | 90 | <?php foreach ($extras as $extra):?> |
91 | - <?= $extra;?> |
|
92 | -<?php endforeach;?> |
|
91 | + <?= $extra; ?> |
|
92 | +<?php endforeach; ?> |
|
93 | 93 | |
94 | 94 | ]; |
95 | 95 | } |
@@ -19,5 +19,5 @@ |
||
19 | 19 | /** |
20 | 20 | * @var string $modelClass The path to the model which is the provider for the rules and fields. |
21 | 21 | */ |
22 | - public $modelClass = '<?= $modelClass;?>'; |
|
22 | + public $modelClass = '<?= $modelClass; ?>'; |
|
23 | 23 | } |
24 | 24 | \ No newline at end of file |
@@ -19,5 +19,5 @@ |
||
19 | 19 | /** |
20 | 20 | * @var string $modelClass The path to the model which is the provider for the rules and fields. |
21 | 21 | */ |
22 | - public $modelClass = '<?= $modelClass;?>'; |
|
22 | + public $modelClass = '<?= $modelClass; ?>'; |
|
23 | 23 | } |
24 | 24 | \ No newline at end of file |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | /** |
11 | 11 | * NgRest Model created with LUYA Version <?php echo $luyaVersion; ?>. |
12 | 12 | * |
13 | -<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name . PHP_EOL; ?> |
|
14 | -<?php endforeach;?> |
|
13 | +<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name.PHP_EOL; ?> |
|
14 | +<?php endforeach; ?> |
|
15 | 15 | */ |
16 | 16 | class <?= $className; ?> extends NgRestModel |
17 | 17 | { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | */ |
52 | 52 | public $i18n = ['<?= implode("', '", $textFields); ?>']; |
53 | 53 | |
54 | -<?php endif;?> |
|
54 | +<?php endif; ?> |
|
55 | 55 | /** |
56 | 56 | * @inheritdoc |
57 | 57 | */ |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | { |
87 | 87 | return [ |
88 | 88 | <?php foreach ($ngrestFieldConfig as $name => $type): ?> |
89 | - '<?=$name; ?>' => '<?= $type;?>', |
|
89 | + '<?=$name; ?>' => '<?= $type; ?>', |
|
90 | 90 | <?php endforeach; ?>]; |
91 | 91 | } |
92 | 92 |
@@ -146,19 +146,19 @@ discard block |
||
146 | 146 | private function getExtraVarDef($type, $varName, $func) |
147 | 147 | { |
148 | 148 | $info = [ |
149 | - 'image-upload' => function ($varName) use ($func) { |
|
149 | + 'image-upload' => function($varName) use ($func) { |
|
150 | 150 | return 'BlockHelper::imageUpload($this->'.$func.'(\''.$varName.'\'), false, true),'; |
151 | 151 | }, |
152 | - 'image-array-upload' => function ($varName) use ($func) { |
|
152 | + 'image-array-upload' => function($varName) use ($func) { |
|
153 | 153 | return 'BlockHelper::imageArrayUpload($this->'.$func.'(\''.$varName.'\'), false, true),'; |
154 | 154 | }, |
155 | - 'file-upload' => function ($varName) use ($func) { |
|
155 | + 'file-upload' => function($varName) use ($func) { |
|
156 | 156 | return 'BlockHelper::fileUpload($this->'.$func.'(\''.$varName.'\'), true),'; |
157 | 157 | }, |
158 | - 'file-array-upload' => function ($varName) use ($func) { |
|
158 | + 'file-array-upload' => function($varName) use ($func) { |
|
159 | 159 | return 'BlockHelper::fileArrayUpload($this->'.$func.'(\''.$varName.'\'), true),'; |
160 | 160 | }, |
161 | - 'cms-page' => function ($varName) use ($func) { |
|
161 | + 'cms-page' => function($varName) use ($func) { |
|
162 | 162 | return 'Yii::$app->menu->findOne([\'nav_id\' => $this->'.$func.'(\''.$varName.'\', 0)]),'; |
163 | 163 | }, |
164 | 164 | ]; |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | return 'app\\blocks'; |
247 | 247 | } |
248 | 248 | |
249 | - return Yii::$app->getModule($this->moduleName)->getNamespace() . '\\blocks'; |
|
249 | + return Yii::$app->getModule($this->moduleName)->getNamespace().'\\blocks'; |
|
250 | 250 | } |
251 | 251 | |
252 | 252 | protected function getFileBasePath() |
@@ -343,8 +343,8 @@ discard block |
||
343 | 343 | } |
344 | 344 | } |
345 | 345 | |
346 | - $folder = $this->getFileBasePath() . DIRECTORY_SEPARATOR . 'blocks'; |
|
347 | - $filePath = $folder . DIRECTORY_SEPARATOR . $this->blockName . '.php'; |
|
346 | + $folder = $this->getFileBasePath().DIRECTORY_SEPARATOR.'blocks'; |
|
347 | + $filePath = $folder.DIRECTORY_SEPARATOR.$this->blockName.'.php'; |
|
348 | 348 | |
349 | 349 | sort($this->phpdoc); |
350 | 350 | |
@@ -368,14 +368,14 @@ discard block |
||
368 | 368 | if (FileHelper::createDirectory($folder) && FileHelper::writeFile($filePath, $content)) { |
369 | 369 | |
370 | 370 | // generate view file based on block object view context |
371 | - $object = Yii::createObject(['class' => $this->getFileNamespace() . '\\' . $this->blockName]); |
|
371 | + $object = Yii::createObject(['class' => $this->getFileNamespace().'\\'.$this->blockName]); |
|
372 | 372 | $viewsFolder = Yii::getAlias($object->getViewPath()); |
373 | - $viewFilePath = $viewsFolder . DIRECTORY_SEPARATOR . $object->getViewFileName('php'); |
|
373 | + $viewFilePath = $viewsFolder.DIRECTORY_SEPARATOR.$object->getViewFileName('php'); |
|
374 | 374 | if (FileHelper::createDirectory($viewsFolder) && FileHelper::writeFile($viewFilePath, $this->generateViewFile($this->blockName))) { |
375 | - $this->outputInfo('View file for the block has been created: ' . $viewFilePath); |
|
375 | + $this->outputInfo('View file for the block has been created: '.$viewFilePath); |
|
376 | 376 | } |
377 | 377 | |
378 | - return $this->outputSuccess("Block {$this->blockName} has been created: " . $filePath); |
|
378 | + return $this->outputSuccess("Block {$this->blockName} has been created: ".$filePath); |
|
379 | 379 | } |
380 | 380 | |
381 | 381 | return $this->outputError("Error while creating block '$filePath'"); |
@@ -146,6 +146,11 @@ discard block |
||
146 | 146 | ]; |
147 | 147 | } |
148 | 148 | |
149 | + /** |
|
150 | + * @param string $type |
|
151 | + * @param string $varName |
|
152 | + * @param string $func |
|
153 | + */ |
|
149 | 154 | private function getExtraVarDef($type, $varName, $func) |
150 | 155 | { |
151 | 156 | $info = [ |
@@ -173,6 +178,9 @@ discard block |
||
173 | 178 | return false; |
174 | 179 | } |
175 | 180 | |
181 | + /** |
|
182 | + * @param string $type |
|
183 | + */ |
|
176 | 184 | private function getVariableTypeOption($type) |
177 | 185 | { |
178 | 186 | $types = $this->getVariableTypesOptions(); |
@@ -180,11 +188,17 @@ discard block |
||
180 | 188 | return $types[$type]; |
181 | 189 | } |
182 | 190 | |
191 | + /** |
|
192 | + * @param string $type |
|
193 | + */ |
|
183 | 194 | private function hasVariableTypeOption($type) |
184 | 195 | { |
185 | 196 | return array_key_exists($type, $this->getVariableTypesOptions()); |
186 | 197 | } |
187 | 198 | |
199 | + /** |
|
200 | + * @param string $prefix |
|
201 | + */ |
|
188 | 202 | private function placeholderCreator($prefix) |
189 | 203 | { |
190 | 204 | $this->output(PHP_EOL.'-> Create new '.$prefix, Console::FG_YELLOW); |