@@ -47,8 +47,9 @@ |
||
47 | 47 | return self::$_configs['custom'][$path]; |
48 | 48 | } |
49 | 49 | |
50 | - if (!file_exists($path)) |
|
51 | - return []; |
|
50 | + if (!file_exists($path)) { |
|
51 | + return []; |
|
52 | + } |
|
52 | 53 | |
53 | 54 | return self::$_configs['custom'][$path] = include $path; |
54 | 55 | } |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | return self::$_configs['system']; |
29 | 29 | } |
30 | 30 | |
31 | - if (!file_exists(INJI_SYSTEM_DIR . '/config/config.php')) { |
|
31 | + if (!file_exists(INJI_SYSTEM_DIR.'/config/config.php')) { |
|
32 | 32 | return []; |
33 | 33 | } |
34 | 34 | |
35 | - return self::$_configs['system'] = include INJI_SYSTEM_DIR . '/config/config.php'; |
|
35 | + return self::$_configs['system'] = include INJI_SYSTEM_DIR.'/config/config.php'; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | /** |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | return self::$_configs['app'][$app->name]; |
69 | 69 | } |
70 | 70 | |
71 | - $path = $app->path . "/config/config.php"; |
|
71 | + $path = $app->path."/config/config.php"; |
|
72 | 72 | if (!file_exists($path)) { |
73 | 73 | return []; |
74 | 74 | } |
@@ -88,16 +88,16 @@ discard block |
||
88 | 88 | if (isset(self::$_configs['shareModules'][$module])) { |
89 | 89 | return self::$_configs['shareModules'][$module]; |
90 | 90 | } |
91 | - $path = INJI_PROGRAM_DIR . "/config/modules/{$module}.php"; |
|
91 | + $path = INJI_PROGRAM_DIR."/config/modules/{$module}.php"; |
|
92 | 92 | } else { |
93 | 93 | if (isset(self::$_configs['share'])) { |
94 | 94 | return self::$_configs['share']; |
95 | 95 | } |
96 | - $path = INJI_PROGRAM_DIR . "/config/config.php"; |
|
96 | + $path = INJI_PROGRAM_DIR."/config/config.php"; |
|
97 | 97 | } |
98 | 98 | if (!file_exists($path)) { |
99 | - if (file_exists(INJI_SYSTEM_DIR . "/modules/{$module}/defaultConfig.php")) { |
|
100 | - $path = INJI_SYSTEM_DIR . "/modules/{$module}/defaultConfig.php"; |
|
99 | + if (file_exists(INJI_SYSTEM_DIR."/modules/{$module}/defaultConfig.php")) { |
|
100 | + $path = INJI_SYSTEM_DIR."/modules/{$module}/defaultConfig.php"; |
|
101 | 101 | } else { |
102 | 102 | return []; |
103 | 103 | } |
@@ -136,9 +136,9 @@ discard block |
||
136 | 136 | return self::$_configs['module'][$appName][$module_name]; |
137 | 137 | } |
138 | 138 | |
139 | - $path = $appPath . "/config/modules/{$module_name}.php"; |
|
139 | + $path = $appPath."/config/modules/{$module_name}.php"; |
|
140 | 140 | if (!file_exists($path)) { |
141 | - $path = INJI_SYSTEM_DIR . "/modules/{$module_name}/defaultConfig.php"; |
|
141 | + $path = INJI_SYSTEM_DIR."/modules/{$module_name}/defaultConfig.php"; |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | |
@@ -163,27 +163,27 @@ discard block |
||
163 | 163 | } |
164 | 164 | switch ($type) { |
165 | 165 | case 'system': |
166 | - $path = INJI_SYSTEM_DIR . '/config/config.php'; |
|
166 | + $path = INJI_SYSTEM_DIR.'/config/config.php'; |
|
167 | 167 | self::$_configs['system'] = $data; |
168 | 168 | Inji::$inst->event('Config-change-system', $data); |
169 | 169 | break; |
170 | 170 | case 'app': |
171 | - $path = $app->path . "/config/config.php"; |
|
171 | + $path = $app->path."/config/config.php"; |
|
172 | 172 | self::$_configs['app'][$app->name] = $data; |
173 | - Inji::$inst->event('Config-change-app-' . $app->name, $data); |
|
173 | + Inji::$inst->event('Config-change-app-'.$app->name, $data); |
|
174 | 174 | break; |
175 | 175 | case 'module': |
176 | - $path = $app->path . "/config/modules/{$module}.php"; |
|
176 | + $path = $app->path."/config/modules/{$module}.php"; |
|
177 | 177 | self::$_configs['module'][$app->name][$module] = $data; |
178 | - Inji::$inst->event('Config-change-module-' . $app->name . '-' . $module, $data); |
|
178 | + Inji::$inst->event('Config-change-module-'.$app->name.'-'.$module, $data); |
|
179 | 179 | break; |
180 | 180 | case 'share': |
181 | 181 | if ($module) { |
182 | - $path = INJI_PROGRAM_DIR . "/config/modules/{$module}.php"; |
|
182 | + $path = INJI_PROGRAM_DIR."/config/modules/{$module}.php"; |
|
183 | 183 | self::$_configs['shareModules'][$module] = $data; |
184 | - Inji::$inst->event('Config-change-shareModules-' . $module, $data); |
|
184 | + Inji::$inst->event('Config-change-shareModules-'.$module, $data); |
|
185 | 185 | } else { |
186 | - $path = INJI_PROGRAM_DIR . "/config/config.php"; |
|
186 | + $path = INJI_PROGRAM_DIR."/config/config.php"; |
|
187 | 187 | self::$_configs['share'] = $data; |
188 | 188 | Inji::$inst->event('Config-change-share', $data); |
189 | 189 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | self::$_configs['custom'][$path] = $data; |
194 | 194 | break; |
195 | 195 | } |
196 | - $text = "<?php\nreturn " . CodeGenerator::genArray($data); |
|
196 | + $text = "<?php\nreturn ".CodeGenerator::genArray($data); |
|
197 | 197 | Tools::createDir(substr($path, 0, strripos($path, '/'))); |
198 | 198 | file_put_contents($path, $text); |
199 | 199 | } |
@@ -15,6 +15,9 @@ |
||
15 | 15 | { |
16 | 16 | public $xml = null; |
17 | 17 | |
18 | + /** |
|
19 | + * @param \SimpleXMLElement $xml |
|
20 | + */ |
|
18 | 21 | public function __construct($xml) |
19 | 22 | { |
20 | 23 | $this->xml = $xml; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $cart->warehouse_block = 0; |
71 | 71 | foreach ($cart->cartItems as $cci) { |
72 | 72 | if ($cci->price && $cci->price->offer) { |
73 | - $cci->price->offer->changeWarehouse('-' . (float) $cci->count); |
|
73 | + $cci->price->offer->changeWarehouse('-'.(float) $cci->count); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | foreach ($cart->cartItems as $cartItem) { |
134 | 134 | $isset = false; |
135 | 135 | foreach ($cItems as $key => $cItem) { |
136 | - if (!($cItem['item_id'] == $cartItem->item_id )) { |
|
136 | + if (!($cItem['item_id'] == $cartItem->item_id)) { |
|
137 | 137 | continue; |
138 | 138 | } |
139 | 139 | $isset = true; |
@@ -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 | |
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 | |
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 | |
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 | |
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 | |
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 | |
5 | 5 | $groups = [ |
6 | 6 | [ |