@@ -8,7 +8,7 @@ |
||
| 8 | 8 | * @covers Inji::unlisten |
| 9 | 9 | */ |
| 10 | 10 | public function testNotSavingEvent() { |
| 11 | - \Inji::$inst->listen('testEvent', 'testCallback', function() { |
|
| 11 | + \Inji::$inst->listen('testEvent', 'testCallback', function () { |
|
| 12 | 12 | return true; |
| 13 | 13 | }); |
| 14 | 14 | $this->assertEquals(true, Inji::$inst->event('testEvent')); |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | define('INJI_DOMAIN_NAME', 'test.app'); |
| 17 | 17 | |
| 18 | -spl_autoload_register(function($class_name) { |
|
| 18 | +spl_autoload_register(function ($class_name) { |
|
| 19 | 19 | if (file_exists(INJI_SYSTEM_DIR . '/Inji/' . $class_name . '.php')) { |
| 20 | 20 | include_once INJI_SYSTEM_DIR . '/Inji/' . $class_name . '.php'; |
| 21 | 21 | } |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | //load core |
| 25 | 25 | Inji::$inst = new Inji(); |
| 26 | 26 | Inji::$config = Config::system(); |
| 27 | -Inji::$inst->listen('Config-change-system', 'systemConfig', function($event) { |
|
| 27 | +Inji::$inst->listen('Config-change-system', 'systemConfig', function ($event) { |
|
| 28 | 28 | Inji::$config = $event['eventObject']; |
| 29 | 29 | return $event['eventObject']; |
| 30 | 30 | }); |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | App::$cur->params = []; |
| 46 | 46 | App::$cur->config = Config::app(App::$cur); |
| 47 | 47 | App::$primary = App::$cur; |
| 48 | -Inji::$inst->listen('Config-change-app-' . App::$cur->name, 'curAppConfig', function($event) { |
|
| 48 | +Inji::$inst->listen('Config-change-app-' . App::$cur->name, 'curAppConfig', function ($event) { |
|
| 49 | 49 | App::$cur->config = $event['eventObject']; |
| 50 | 50 | return $event['eventObject']; |
| 51 | 51 | }); |
@@ -5,6 +5,6 @@ |
||
| 5 | 5 | 'file' => 'index.html', |
| 6 | 6 | 'css' => ['style.css'], |
| 7 | 7 | 'libs' => [ |
| 8 | - 'JqueryUi', 'PaperTheme','FancyBox' |
|
| 8 | + 'JqueryUi', 'PaperTheme', 'FancyBox' |
|
| 9 | 9 | ] |
| 10 | 10 | ]; |
@@ -17,12 +17,12 @@ |
||
| 17 | 17 | <div class="row"> |
| 18 | 18 | <div class="col-xs-6 ecommerce-showoptions-sort"> |
| 19 | 19 | <span class="caption">Сортировка:</span> |
| 20 | - <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['price' => sortToggler('price','asc')]])); ?>">По цене<?= sortDirectionIcon('price'); ?></a> |
|
| 21 | - <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['sales' => sortToggler('sales','desc')]])); ?>">По популярности<?= sortDirectionIcon('sales'); ?></a> |
|
| 20 | + <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['price' => sortToggler('price', 'asc')]])); ?>">По цене<?= sortDirectionIcon('price'); ?></a> |
|
| 21 | + <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['sales' => sortToggler('sales', 'desc')]])); ?>">По популярности<?= sortDirectionIcon('sales'); ?></a> |
|
| 22 | 22 | <?php |
| 23 | 23 | if (!empty(App::$cur->ecommerce->config['isset_sort'])) { |
| 24 | 24 | ?> |
| 25 | - <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['isset' => sortToggler('isset','desc')]])); ?>">По наличию<?= sortDirectionIcon('isset'); ?></a> |
|
| 25 | + <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['isset' => sortToggler('isset', 'desc')]])); ?>">По наличию<?= sortDirectionIcon('isset'); ?></a> |
|
| 26 | 26 | <?php |
| 27 | 27 | } |
| 28 | 28 | ?> |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | public function parseColsForModel($cols = []) { |
| 26 | - $modelCols = [ 'labels' => [], 'cols' => [], 'relations' => []]; |
|
| 26 | + $modelCols = ['labels' => [], 'cols' => [], 'relations' => []]; |
|
| 27 | 27 | foreach ($cols as $col) { |
| 28 | 28 | $modelCols['labels'][$col['code']] = $col['label']; |
| 29 | 29 | $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type']; |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | -require_once( INJI_SYSTEM_DIR . '/init.php' ); |
|
| 40 | +require_once(INJI_SYSTEM_DIR . '/init.php'); |
|
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * System error messages |
@@ -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 | } |
@@ -1120,7 +1120,7 @@ discard block |
||
| 1120 | 1120 | $items[$item[$arrayKey]] = new $class($item); |
| 1121 | 1121 | } |
| 1122 | 1122 | if (!empty($options['order'])) { |
| 1123 | - usort($items, function($a, $b) use($options) { |
|
| 1123 | + usort($items, function ($a, $b) use($options) { |
|
| 1124 | 1124 | if ($a->{$options['order'][0]} > $b->{$options['order'][0]} && $options['order'][1] = 'asc') { |
| 1125 | 1125 | return 1; |
| 1126 | 1126 | } elseif ($a->{$options['order'][0]} < $b->{$options['order'][0]} && $options['order'][1] = 'asc') { |
@@ -1303,7 +1303,7 @@ discard block |
||
| 1303 | 1303 | } else { |
| 1304 | 1304 | $cols .= '*'; |
| 1305 | 1305 | } |
| 1306 | - $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : ''); |
|
| 1306 | + $cols .= ') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : ''); |
|
| 1307 | 1307 | $query->cols = $cols; |
| 1308 | 1308 | if (!empty($options['group'])) { |
| 1309 | 1309 | $query->group($options['group']); |
@@ -1962,7 +1962,7 @@ discard block |
||
| 1962 | 1962 | if (!$value && !empty(static::$cols[$shortName]) && in_array('emptyValue', array_keys(static::$cols[$shortName]))) { |
| 1963 | 1963 | $value = static::$cols[$shortName]['emptyValue']; |
| 1964 | 1964 | } |
| 1965 | - if(is_null($value) && empty(static::$cols[$shortName]['null'])){ |
|
| 1965 | + if (is_null($value) && empty(static::$cols[$shortName]['null'])) { |
|
| 1966 | 1966 | $value = ''; |
| 1967 | 1967 | } |
| 1968 | 1968 | if (!empty($className::$cols[$shortName])) { |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | - 'up' => function() { |
|
| 4 | + 'up' => function () { |
|
| 5 | 5 | Materials\Material::createCol('date_publish'); |
| 6 | 6 | foreach (Materials\Material::getList() as $material) { |
| 7 | 7 | $material->date_publish = $material->date_create; |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | $this->categoryAction($category->id); |
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | - } elseif(!$material) { |
|
| 59 | + } elseif (!$material) { |
|
| 60 | 60 | $material = Materials\Material::get(1, 'default'); |
| 61 | 61 | } |
| 62 | 62 | if ($material) { |