@@ -239,8 +239,9 @@ discard block |
||
239 | 239 | */ |
240 | 240 | public function registerFunction($name, $callback) |
241 | 241 | { |
242 | - if (isset($this->_panelFunctions[$name])) |
|
243 | - throw new InvalidParamException("The '$name'-function has already been defined."); |
|
242 | + if (isset($this->_panelFunctions[$name])) { |
|
243 | + throw new InvalidParamException("The '$name'-function has already been defined."); |
|
244 | + } |
|
244 | 245 | |
245 | 246 | $this->_panelFunctions[$name] = $callback; |
246 | 247 | } |
@@ -260,8 +261,9 @@ discard block |
||
260 | 261 | */ |
261 | 262 | public function __call($name, $params) |
262 | 263 | { |
263 | - if (!isset($this->_panelFunctions[$name])) |
|
264 | - throw new \yii\base\InvalidCallException("Unknown panel function '$name'"); |
|
264 | + if (!isset($this->_panelFunctions[$name])) { |
|
265 | + throw new \yii\base\InvalidCallException("Unknown panel function '$name'"); |
|
266 | + } |
|
265 | 267 | |
266 | 268 | return call_user_func_array($this->_panelFunctions[$name], $params); |
267 | 269 | } |
@@ -333,13 +335,15 @@ discard block |
||
333 | 335 | public function getPanel($identifier) |
334 | 336 | { |
335 | 337 | $config = null; |
336 | - if (isset($this->panels[$identifier])) |
|
337 | - $config = $this->panels[$identifier]; |
|
338 | - elseif (isset($this->_corePanels[$identifier])) |
|
339 | - $config = $this->_corePanels[$identifier]; |
|
338 | + if (isset($this->panels[$identifier])) { |
|
339 | + $config = $this->panels[$identifier]; |
|
340 | + } elseif (isset($this->_corePanels[$identifier])) { |
|
341 | + $config = $this->_corePanels[$identifier]; |
|
342 | + } |
|
340 | 343 | |
341 | - if (!$config) |
|
342 | - throw new InvalidConfigException("'$identifier' is not a valid panel identifier"); |
|
344 | + if (!$config) { |
|
345 | + throw new InvalidConfigException("'$identifier' is not a valid panel identifier"); |
|
346 | + } |
|
343 | 347 | |
344 | 348 | if (is_array($config)) { |
345 | 349 | $config['module'] = $this; |
@@ -360,11 +364,11 @@ discard block |
||
360 | 364 | foreach ($this->panels as $key => $value) { |
361 | 365 | if (is_numeric($key)) { |
362 | 366 | // The $value contains the identifier of a core panel |
363 | - if (!isset($this->_corePanels[$value])) |
|
364 | - throw new InvalidConfigException("'$value' is not a valid panel identifier"); |
|
367 | + if (!isset($this->_corePanels[$value])) { |
|
368 | + throw new InvalidConfigException("'$value' is not a valid panel identifier"); |
|
369 | + } |
|
365 | 370 | $panels[$value] = $this->_corePanels[$value]; |
366 | - } |
|
367 | - else { |
|
371 | + } else { |
|
368 | 372 | // The key contains the identifier and the value is either a class name or a full array |
369 | 373 | $panels[$key] = is_string($value) ? ['class' => $value] : $value; |
370 | 374 | } |
@@ -374,10 +378,11 @@ discard block |
||
374 | 378 | // We now need one more iteration to add core classes to the panels added via the merge, if needed |
375 | 379 | array_walk($this->panels, function(&$value, $key) { |
376 | 380 | if (!isset($value['class'])) { |
377 | - if (isset($this->_corePanels[$key])) |
|
378 | - $value = ArrayHelper::merge($value, $this->_corePanels[$key]); |
|
379 | - else |
|
380 | - throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified."); |
|
381 | + if (isset($this->_corePanels[$key])) { |
|
382 | + $value = ArrayHelper::merge($value, $this->_corePanels[$key]); |
|
383 | + } else { |
|
384 | + throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified."); |
|
385 | + } |
|
381 | 386 | } |
382 | 387 | }); |
383 | 388 | } |
@@ -389,18 +394,21 @@ discard block |
||
389 | 394 | { |
390 | 395 | foreach (Yii::$app->modules as $name => $module) { |
391 | 396 | $class = null; |
392 | - if (is_string($module)) |
|
393 | - $class = $module; |
|
394 | - elseif (is_array($module)) { |
|
395 | - if (isset($module['class'])) |
|
396 | - $class = $module['class']; |
|
397 | - } else |
|
398 | - /** @var Module $module */ |
|
397 | + if (is_string($module)) { |
|
398 | + $class = $module; |
|
399 | + } elseif (is_array($module)) { |
|
400 | + if (isset($module['class'])) { |
|
401 | + $class = $module['class']; |
|
402 | + } |
|
403 | + } else { |
|
404 | + /** @var Module $module */ |
|
399 | 405 | $class = $module::className(); |
406 | + } |
|
400 | 407 | |
401 | 408 | $parts = explode('\\', $class); |
402 | - if ($class && strtolower(end($parts)) == 'audit') |
|
403 | - return $name; |
|
409 | + if ($class && strtolower(end($parts)) == 'audit') { |
|
410 | + return $name; |
|
411 | + } |
|
404 | 412 | } |
405 | 413 | return null; |
406 | 414 | } |
@@ -436,18 +444,21 @@ discard block |
||
436 | 444 | $len = strlen($compare); |
437 | 445 | if ($compare[$len - 1] == '*') { |
438 | 446 | $compare = rtrim($compare, '*'); |
439 | - if (substr($route, 0, $len - 1) === $compare) |
|
440 | - return true; |
|
447 | + if (substr($route, 0, $len - 1) === $compare) { |
|
448 | + return true; |
|
449 | + } |
|
441 | 450 | } |
442 | 451 | |
443 | 452 | if ($compare[0] == '*') { |
444 | 453 | $compare = ltrim($compare, '*'); |
445 | - if (substr($route, - ($len - 1)) === $compare) |
|
446 | - return true; |
|
454 | + if (substr($route, - ($len - 1)) === $compare) { |
|
455 | + return true; |
|
456 | + } |
|
447 | 457 | } |
448 | 458 | |
449 | - if ($route === $compare) |
|
450 | - return true; |
|
459 | + if ($route === $compare) { |
|
460 | + return true; |
|
461 | + } |
|
451 | 462 | } |
452 | 463 | return false; |
453 | 464 | } |
@@ -87,8 +87,9 @@ |
||
87 | 87 | public function cleanup($maxAge = null) |
88 | 88 | { |
89 | 89 | $maxAge = $maxAge !== null ? $maxAge : $this->maxAge; |
90 | - if ($maxAge === null) |
|
91 | - return false; |
|
90 | + if ($maxAge === null) { |
|
91 | + return false; |
|
92 | + } |
|
92 | 93 | return AuditTrail::deleteAll([ |
93 | 94 | '<=', 'created', date('Y-m-d 23:59:59', strtotime("-$maxAge days")) |
94 | 95 | ]); |
@@ -87,8 +87,9 @@ |
||
87 | 87 | public function cleanup($maxAge = null) |
88 | 88 | { |
89 | 89 | $maxAge = $maxAge !== null ? $maxAge : $this->maxAge; |
90 | - if ($maxAge === null) |
|
91 | - return false; |
|
90 | + if ($maxAge === null) { |
|
91 | + return false; |
|
92 | + } |
|
92 | 93 | return AuditTrail::deleteAll([ |
93 | 94 | '<=', 'created', date('Y-m-d 23:59:59', strtotime("-$maxAge days")) |
94 | 95 | ]); |
@@ -35,8 +35,9 @@ |
||
35 | 35 | { |
36 | 36 | $this->module->registerPanel($this); |
37 | 37 | |
38 | - if (!is_array($this->data)) |
|
39 | - $this->data = []; |
|
38 | + if (!is_array($this->data)) { |
|
39 | + $this->data = []; |
|
40 | + } |
|
40 | 41 | |
41 | 42 | if (isset($data['error'])) { |
42 | 43 | $error = $this->module->exception($data['error']); |