@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function($step = NULL, $params = []) { |
|
4 | 4 | |
5 | 5 | $groups = [ |
6 | 6 | [ |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function ($step = null, $params = []) { |
|
4 | 4 | App::$cur->db->createTable('notifications_notification', [ |
5 | 5 | 'notification_id' => 'pk', |
6 | 6 | 'notification_chanel_id' => 'int(11) UNSIGNED NOT NULL', |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $concatenation = ''; |
185 | 185 | } |
186 | 186 | |
187 | - if ($this->whereString == NULL) { |
|
187 | + if ($this->whereString == null) { |
|
188 | 188 | $this->whereString = ' WHERE '; |
189 | 189 | } |
190 | 190 | |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | $this->whereString .= "{$concatenation} "; |
233 | 233 | } |
234 | 234 | |
235 | - if ($this->whereString != NULL) { |
|
235 | + if ($this->whereString != null) { |
|
236 | 236 | $this->whereString .= '('; |
237 | 237 | } else { |
238 | 238 | $this->whereString = 'WHERE ('; |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | $concatenation = ''; |
272 | 272 | } |
273 | 273 | |
274 | - if ($this->havingString == NULL) { |
|
274 | + if ($this->havingString == null) { |
|
275 | 275 | $this->havingString = ' HAVING '; |
276 | 276 | } |
277 | 277 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $this->havingString .= "{$concatenation} "; |
320 | 320 | } |
321 | 321 | |
322 | - if ($this->havingString != NULL) { |
|
322 | + if ($this->havingString != null) { |
|
323 | 323 | $this->havingString .= '('; |
324 | 324 | } else { |
325 | 325 | $this->havingString = 'HAVING ('; |
@@ -32,7 +32,7 @@ |
||
32 | 32 | public $distinct = false; |
33 | 33 | |
34 | 34 | /** |
35 | - * @param $instance |
|
35 | + * @param $instance |
|
36 | 36 | */ |
37 | 37 | public function __construct($instance = null) { |
38 | 38 | if (!$instance) { |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function($step = NULL, $params = []) { |
|
3 | +return function($step = null, $params = []) { |
|
4 | 4 | $options = ['max_height' => 1200, 'max_width' => 1200]; |
5 | 5 | $types = [ |
6 | 6 | [ |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function($step = NULL, $params = []) { |
|
3 | +return function($step = null, $params = []) { |
|
4 | 4 | $options = ['max_height' => 1200, 'max_width' => 1200]; |
5 | 5 | $types = [ |
6 | 6 | [ |
@@ -58,6 +58,10 @@ |
||
58 | 58 | self::command('install', false, $path); |
59 | 59 | } |
60 | 60 | |
61 | + /** |
|
62 | + * @param string $command |
|
63 | + * @param string $path |
|
64 | + */ |
|
61 | 65 | static function command($command, $needOutput = true, $path = null) |
62 | 66 | { |
63 | 67 | include_once 'composer/vendor/autoload.php'; |
@@ -33,7 +33,7 @@ |
||
33 | 33 | 'start' => $pages->params['start'], |
34 | 34 | 'limit' => $pages->params['limit'], |
35 | 35 | ]); |
36 | -foreach ($histories as $history) { |
|
36 | +foreach ($histories as $history) { |
|
37 | 37 | $amount = $history->amount; |
38 | 38 | $table->addRow([ |
39 | 39 | $history->id, |
@@ -12,9 +12,9 @@ |
||
12 | 12 | <div class ="category-materials"> |
13 | 13 | <div class ="row"> |
14 | 14 | <?php |
15 | - $i = 0; |
|
16 | - foreach ($materials as $material) { |
|
17 | - ?> |
|
15 | + $i = 0; |
|
16 | + foreach ($materials as $material) { |
|
17 | + ?> |
|
18 | 18 | <div class = "col-sm-6 category-material"> |
19 | 19 | <a class="category-material-name" href ="<?= $material->getHref(); ?>"><h3><?= $material->name; ?></h3></a> |
20 | 20 | <div class="category-material-preview"><?= $material->preview; ?></div> |
@@ -2,9 +2,9 @@ |
||
2 | 2 | <div class="row"> |
3 | 3 | <div class="col-md-3"> |
4 | 4 | <?php |
5 | - $category = $material->category; |
|
6 | - $this->widget('Materials\categoryTree', ['category' => $category]); |
|
7 | - ?> |
|
5 | + $category = $material->category; |
|
6 | + $this->widget('Materials\categoryTree', ['category' => $category]); |
|
7 | + ?> |
|
8 | 8 | </div> |
9 | 9 | <div class="col-md-9"> |
10 | 10 | <div class="content"> |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | if ($file) { |
222 | 222 | $photoId = Tools::randomString(); |
223 | 223 | $value = '<a href = "' . $file->path . '" id="' . $photoId . '"><img src="' . $file->path . '?resize=60x120" /></a>'; |
224 | - $value .='<script>inji.onLoad(function(){$("#' . $photoId . '").fancybox();});</script>'; |
|
224 | + $value .= '<script>inji.onLoad(function(){$("#' . $photoId . '").fancybox();});</script>'; |
|
225 | 225 | } else { |
226 | 226 | $value = '<img src="/static/system/images/no-image.png?resize=60x120" />'; |
227 | 227 | } |
@@ -1287,7 +1287,7 @@ discard block |
||
1287 | 1287 | } else { |
1288 | 1288 | $cols .= '*'; |
1289 | 1289 | } |
1290 | - $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : ''); |
|
1290 | + $cols .= ') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : ''); |
|
1291 | 1291 | $query->cols = $cols; |
1292 | 1292 | if (!empty($options['group'])) { |
1293 | 1293 | $query->group($options['group']); |