@@ -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 | { |
@@ -373,12 +373,12 @@ |
||
373 | 373 | |
374 | 374 | // We now need one more iteration to add core classes to the panels added via the merge, if needed |
375 | 375 | array_walk($this->panels, function(&$value, $key) { |
376 | - 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 | - } |
|
376 | + 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 | + } |
|
382 | 382 | }); |
383 | 383 | } |
384 | 384 |
@@ -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) |