MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [compatibility] Support for php < 7.2 for an organisation that shall go unnamed

pull/8534/head
iglocska 2022-08-08 15:56:55 +02:00
parent f8c27c86b5
commit fa3a67d22b
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Model/Behavior/DefaultCorrelationBehavior.php
View File

@ -160,7 +160,8 @@ class DefaultCorrelationBehavior extends ModelBehavior
}
}
public function runBeforeSaveCorrelation(Model $Model, $attribute) {
public function runBeforeSaveCorrelation(Model $Model, $attribute)
{
// (update-only) clean up the relation of the old value: remove the existing relations related to that attribute, we DO have a reference, the id
// ==> DELETE FROM default_correlations WHERE 1_attribute_id = $a_id OR attribute_id = $a_id; */
// first check if it's an update
@ -518,7 +519,7 @@ class DefaultCorrelationBehavior extends ModelBehavior
array $data,
string $type = 'event',
array $options = []
): bool
)
{
$updateCorrelation = [];
$updateFields = [
@ -557,7 +558,7 @@ class DefaultCorrelationBehavior extends ModelBehavior
return true;
}
public function purgeCorrelations(Model $Model, $eventId = null): void
public function purgeCorrelations(Model $Model, $eventId = null)
{
if (!$eventId) {
$Model->query('TRUNCATE TABLE default_correlations;');
@ -573,7 +574,7 @@ class DefaultCorrelationBehavior extends ModelBehavior
}
}
public function purgeByValue(Model $Model, string $value): void
public function purgeByValue(Model $Model, string $value)
{
$valueIds = $Model->CorrelationValue->find('column', [
'recursive' => -1,

4
app/Model/Behavior/NoAclCorrelationBehavior.php
View File

@ -352,7 +352,7 @@ class NoAclCorrelationBehavior extends ModelBehavior
return true;
}
public function purgeCorrelations(Model $Model, $eventId = null): void
public function purgeCorrelations(Model $Model, $eventId = null)
{
if (!$eventId) {
$Model->query('TRUNCATE TABLE no_acl_correlations;');
@ -368,7 +368,7 @@ class NoAclCorrelationBehavior extends ModelBehavior
}
}
public function purgeByValue(Model $Model, string $value): void
public function purgeByValue(Model $Model, string $value)
{
$valueIds = $Model->CorrelationValue->find('column', [
'recursive' => -1,