@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | { |
77 | 77 | $entity = static::getEntitiesInfo(); |
78 | 78 | if ($sort) { |
79 | - usort($entity, function ($a, $b) { |
|
79 | + usort($entity, function($a, $b) { |
|
80 | 80 | return $a['sequence'] < $b['sequence'] ? -1 : 1; |
81 | 81 | }); |
82 | 82 | } |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | Log::error("The file $filename does not exist"); |
285 | 285 | } |
286 | 286 | static::initFromDb(); |
287 | - register_shutdown_function(function () { |
|
287 | + register_shutdown_function(function() { |
|
288 | 288 | try { |
289 | 289 | YetiForce\Shop::generateCache(); |
290 | 290 | } catch (\Throwable $e) { |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | switch ($this->get('type')) { |
216 | 216 | case 1: |
217 | 217 | $this->queryGenerator->addNativeCondition([ |
218 | - 'and', ['>=', $columnA, $startFormatted], ['<=', $columnA, $endFormatted] |
|
218 | + 'and', ['>=', $columnA, $startFormatted], ['<=', $columnA, $endFormatted] |
|
219 | 219 | ]); |
220 | 220 | break; |
221 | 221 | case 3: |
@@ -224,9 +224,9 @@ discard block |
||
224 | 224 | $this->queryGenerator->setField($fieldB->getName()); |
225 | 225 | $this->queryGenerator->addNativeCondition([ |
226 | 226 | 'or', |
227 | - ['and', ['>=', $columnA, $startFormatted], ['<=', $columnA, $endFormatted]], |
|
228 | - ['and', ['>=', $columnB, $startFormatted], ['<=', $columnB, $endFormatted]], |
|
229 | - ['and', ['<', $columnA, $startFormatted], ['>', $columnB, $endFormatted]], |
|
227 | + ['and', ['>=', $columnA, $startFormatted], ['<=', $columnA, $endFormatted]], |
|
228 | + ['and', ['>=', $columnB, $startFormatted], ['<=', $columnB, $endFormatted]], |
|
229 | + ['and', ['<', $columnA, $startFormatted], ['>', $columnB, $endFormatted]], |
|
230 | 230 | ]); |
231 | 231 | break; |
232 | 232 | case 2: |
@@ -237,8 +237,8 @@ discard block |
||
237 | 237 | 'or', |
238 | 238 | [ |
239 | 239 | 'and', |
240 | - ['>=', new \yii\db\Expression("CONCAT($columnA, ' ', $columnATime)"), $startDateTime], |
|
241 | - ['<=', new \yii\db\Expression("CONCAT($columnA, ' ', $columnATime)"), $endDateTime], |
|
240 | + ['>=', new \yii\db\Expression("CONCAT($columnA, ' ', $columnATime)"), $startDateTime], |
|
241 | + ['<=', new \yii\db\Expression("CONCAT($columnA, ' ', $columnATime)"), $endDateTime], |
|
242 | 242 | ], |
243 | 243 | ]); |
244 | 244 | break; |
@@ -256,16 +256,16 @@ discard block |
||
256 | 256 | 'or', |
257 | 257 | [ |
258 | 258 | 'and', |
259 | - ['>=', new \yii\db\Expression("CONCAT($columnA, ' ', $columnATime)"), $startDateTime], |
|
260 | - ['<=', new \yii\db\Expression("CONCAT($columnA, ' ', $columnATime)"), $endDateTime], |
|
259 | + ['>=', new \yii\db\Expression("CONCAT($columnA, ' ', $columnATime)"), $startDateTime], |
|
260 | + ['<=', new \yii\db\Expression("CONCAT($columnA, ' ', $columnATime)"), $endDateTime], |
|
261 | 261 | ], |
262 | 262 | [ |
263 | 263 | 'and', |
264 | - ['>=', new \yii\db\Expression("CONCAT($columnB, ' ', $columnBTime)"), $startDateTime], |
|
265 | - ['<=', new \yii\db\Expression("CONCAT($columnB, ' ', $columnBTime)"), $endDateTime], |
|
264 | + ['>=', new \yii\db\Expression("CONCAT($columnB, ' ', $columnBTime)"), $startDateTime], |
|
265 | + ['<=', new \yii\db\Expression("CONCAT($columnB, ' ', $columnBTime)"), $endDateTime], |
|
266 | 266 | ], |
267 | 267 | [ |
268 | - 'and', ['<', $columnA, $startDate], ['>', $columnB, $endDate], |
|
268 | + 'and', ['<', $columnA, $startDate], ['>', $columnB, $endDate], |
|
269 | 269 | ], |
270 | 270 | ]); |
271 | 271 | break; |