@@ -82,7 +82,7 @@ |
||
| 82 | 82 | * @param $id |
| 83 | 83 | * @param $attribute |
| 84 | 84 | * @param $version |
| 85 | - * @return null|integer|float|string |
|
| 85 | + * @return string|null |
|
| 86 | 86 | */ |
| 87 | 87 | public static function findAttribute($class, $id, $attribute, $version) |
| 88 | 88 | { |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @param Event $event |
| 39 | - * @return null|static |
|
| 39 | + * @return AuditMail|null |
|
| 40 | 40 | */ |
| 41 | 41 | public function record($event) |
| 42 | 42 | { |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | // and the '.svn' will match all files and directories named exactly '.svn'. |
| 27 | 27 | // Note, the '/' characters in a pattern matches both '/' and '\'. |
| 28 | 28 | // See helpers/FileHelper::findFiles() description for more details on pattern matching rules. |
| 29 | - 'only' => ['*.php', '*.js'], |
|
| 29 | + 'only' => ['*.php', '*.js'], |
|
| 30 | 30 | // array, list of patterns that specify which files (not directories) should be processed. |
| 31 | 31 | // If empty or not set, all files will be processed. |
| 32 | 32 | // Please refer to "except" for details about the patterns. |
@@ -218,8 +218,8 @@ |
||
| 218 | 218 | $query = new Query; |
| 219 | 219 | |
| 220 | 220 | $query->select($queryParams['returnField']) |
| 221 | - ->from($queryParams['tableName']) |
|
| 222 | - ->where([$queryParams['searchField'] => $searchFieldValue]); |
|
| 221 | + ->from($queryParams['tableName']) |
|
| 222 | + ->where([$queryParams['searchField'] => $searchFieldValue]); |
|
| 223 | 223 | |
| 224 | 224 | $rows = $query->all(); |
| 225 | 225 | |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | /** |
| 133 | 133 | * Cleans the AuditEntry data |
| 134 | 134 | * |
| 135 | - * @param $maxAge |
|
| 135 | + * @param integer|null $maxAge |
|
| 136 | 136 | * @return bool |
| 137 | 137 | */ |
| 138 | 138 | protected function cleanupEntry($maxAge) |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | * Cleans the Panel data |
| 161 | 161 | * |
| 162 | 162 | * @param $id |
| 163 | - * @param $maxAge |
|
| 163 | + * @param integer|null $maxAge |
|
| 164 | 164 | * @return bool |
| 165 | 165 | */ |
| 166 | 166 | protected function cleanupPanel($id, $maxAge) |
@@ -240,6 +240,9 @@ |
||
| 240 | 240 | $this->panels = $this->loadPanels(array_keys($this->panels)); |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | + /** |
|
| 244 | + * @param ActionEvent $event |
|
| 245 | + */ |
|
| 243 | 246 | public function shouldTrack($event, $isError = false) |
| 244 | 247 | { |
| 245 | 248 | $trackActions = $isError ? $this->trackErrorActions : $this->trackActions; |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | // Things required to keep the module yii2-debug compatible |
| 177 | 177 | /* @see \yii\debug\Module::$traceLine (since 2.0.7) */ |
| 178 | 178 | public $traceLine = \yii\debug\Module::DEFAULT_IDE_TRACELINE; |
| 179 | - /* @see \yii\debug\Module::$tracePathMappings (since 2.1.6) */ |
|
| 179 | + /* @see \yii\debug\Module::$tracePathMappings (since 2.1.6) */ |
|
| 180 | 180 | public $tracePathMappings = []; |
| 181 | 181 | |
| 182 | 182 | /** |
@@ -350,9 +350,9 @@ discard block |
||
| 350 | 350 | // This code assumes the audit module is already loaded and can thus look for a derived instance |
| 351 | 351 | $loadedModules = Yii::$app->loadedModules; |
| 352 | 352 | foreach ($loadedModules as $module) { |
| 353 | - if ($module instanceof self) { |
|
| 354 | - return self::$_me = $module; |
|
| 355 | - } |
|
| 353 | + if ($module instanceof self) { |
|
| 354 | + return self::$_me = $module; |
|
| 355 | + } |
|
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | // If we're still here, fall back onto the default implementation |
@@ -482,12 +482,12 @@ discard block |
||
| 482 | 482 | |
| 483 | 483 | // We now need one more iteration to add core classes to the panels added via the merge, if needed |
| 484 | 484 | array_walk($this->panels, function(&$value, $key) { |
| 485 | - if (!isset($value['class'])) { |
|
| 486 | - if (isset($this->_corePanels[$key])) |
|
| 487 | - $value = ArrayHelper::merge($value, $this->_corePanels[$key]); |
|
| 488 | - else |
|
| 489 | - throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified."); |
|
| 490 | - } |
|
| 485 | + if (!isset($value['class'])) { |
|
| 486 | + if (isset($this->_corePanels[$key])) |
|
| 487 | + $value = ArrayHelper::merge($value, $this->_corePanels[$key]); |
|
| 488 | + else |
|
| 489 | + throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified."); |
|
| 490 | + } |
|
| 491 | 491 | }); |
| 492 | 492 | } |
| 493 | 493 | |