mirror of https://github.com/MISP/MISP
chg: [internal] PHP 7.4 is required, so we can remove hacks for older versions vol. 2
parent
22bfe801fd
commit
7b0ebfae5c
|
@ -153,7 +153,7 @@ class JSONConverterTool
|
|||
return;
|
||||
}
|
||||
yield '{"Event":{';
|
||||
$firstKey = key($event['Event']);
|
||||
$firstKey = array_key_first($event['Event']);
|
||||
foreach ($event['Event'] as $key => $value) {
|
||||
if ($key === 'Attribute' || $key === 'Object') { // Encode every object or attribute separately
|
||||
yield ($firstKey === $key ? '' : ',') . json_encode($key) . ":[";
|
||||
|
|
|
@ -2374,9 +2374,9 @@ class AppModel extends Model
|
|||
}
|
||||
|
||||
// alternative to the build in notempty/notblank validation functions, compatible with cakephp <= 2.6 and cakephp and cakephp >= 2.7
|
||||
public function valueNotEmpty($value)
|
||||
public function valueNotEmpty(array $value)
|
||||
{
|
||||
$field = array_keys($value)[0];
|
||||
$field = array_key_first($value);
|
||||
$value = trim($value[$field]);
|
||||
if (!empty($value)) {
|
||||
return true;
|
||||
|
@ -2384,27 +2384,27 @@ class AppModel extends Model
|
|||
return ucfirst($field) . ' cannot be empty.';
|
||||
}
|
||||
|
||||
public function valueIsJson($value)
|
||||
public function valueIsJson(array $value)
|
||||
{
|
||||
$value = array_values($value)[0];
|
||||
$value = current($value);
|
||||
if (!JsonTool::isValid($value)) {
|
||||
return __('Invalid JSON.');
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public function valueIsID($value)
|
||||
public function valueIsID(array $value)
|
||||
{
|
||||
$field = array_keys($value)[0];
|
||||
$field = array_key_first($value);
|
||||
if (!is_numeric($value[$field]) || $value[$field] < 0) {
|
||||
return 'Invalid ' . ucfirst($field) . ' ID';
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public function stringNotEmpty($value)
|
||||
public function stringNotEmpty(array $value)
|
||||
{
|
||||
$field = array_keys($value)[0];
|
||||
$field = array_key_first($value);
|
||||
$value = trim($value[$field]);
|
||||
if (!isset($value) || ($value == false && $value !== "0")) {
|
||||
return ucfirst($field) . ' cannot be empty.';
|
||||
|
@ -3713,7 +3713,7 @@ class AppModel extends Model
|
|||
if (!$isRule) {
|
||||
$args = func_get_args();
|
||||
$fields = $args[1];
|
||||
$or = isset($args[2]) ? $args[2] : true;
|
||||
$or = $args[2] ?? true;
|
||||
}
|
||||
}
|
||||
if (!is_array($fields)) {
|
||||
|
@ -3995,21 +3995,21 @@ class AppModel extends Model
|
|||
");
|
||||
}
|
||||
|
||||
public function findOrder($order, $order_model, $valid_order_fields)
|
||||
public function findOrder($order, $orderModel, $validOrderFields)
|
||||
{
|
||||
if (!is_array($order)) {
|
||||
$order_rules = explode(' ', strtolower($order));
|
||||
$order_field = explode('.', $order_rules[0]);
|
||||
$order_field = end($order_field);
|
||||
if (in_array($order_field, $valid_order_fields)) {
|
||||
$orderRules = explode(' ', strtolower($order));
|
||||
$orderField = explode('.', $orderRules[0]);
|
||||
$orderField = end($orderField);
|
||||
if (in_array($orderField, $validOrderFields, true)) {
|
||||
$direction = 'asc';
|
||||
if (!empty($order_rules[1]) && trim($order_rules[1]) === 'desc') {
|
||||
if (!empty($orderRules[1]) && trim($orderRules[1]) === 'desc') {
|
||||
$direction = 'desc';
|
||||
}
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
return $order_model . '.' . $order_field . ' ' . $direction;
|
||||
return $orderModel . '.' . $orderField . ' ' . $direction;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -434,7 +434,7 @@ class Attribute extends AppModel
|
|||
public function afterSave($created, $options = array())
|
||||
{
|
||||
// Passing event in `parentEvent` field will speed up correlation
|
||||
$passedEvent = isset($options['parentEvent']) ? $options['parentEvent'] : false;
|
||||
$passedEvent = $options['parentEvent'] ?? false;
|
||||
|
||||
$attribute = $this->data['Attribute'];
|
||||
|
||||
|
@ -808,7 +808,7 @@ class Attribute extends AppModel
|
|||
// check whether the variable is null or datetime
|
||||
public function datetimeOrNull($fields)
|
||||
{
|
||||
$seen = array_values($fields)[0];
|
||||
$seen = current($fields);
|
||||
if ($seen === null) {
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -3,12 +3,12 @@ $keyUsageCsv = null;
|
|||
if (isset($keyUsage)) {
|
||||
$todayString = date('Y-m-d');
|
||||
$today = strtotime($todayString);
|
||||
$startDate = key($keyUsage); // oldest date for sparkline
|
||||
$startDate = array_key_first($keyUsage); // oldest date for sparkline
|
||||
$startDate = strtotime($startDate) - (3600 * 24 * 3);
|
||||
$keyUsageCsv = 'Date,Close\n';
|
||||
for ($date = $startDate; $date <= $today; $date += (3600 * 24)) {
|
||||
$dateAsString = date('Y-m-d', $date);
|
||||
$keyUsageCsv .= $dateAsString . ',' . (isset($keyUsage[$dateAsString]) ? $keyUsage[$dateAsString] : 0) . '\n';
|
||||
$keyUsageCsv .= $dateAsString . ',' . ($keyUsage[$dateAsString] ?? '0') . '\n';
|
||||
}
|
||||
} else {
|
||||
$lastUsed = null;
|
||||
|
|
Loading…
Reference in New Issue