CoreLibs Array keyword remove and switch over to []

This commit is contained in:
Clemens Schwaighofer
2021-06-30 15:07:22 +09:00
parent 76e0c0ac06
commit 678aa7460e
17 changed files with 57 additions and 46 deletions
+2 -2
View File
@@ -122,7 +122,7 @@ class ArrayHandler
/**
* array search simple. looks for key, value combination, if found, returns true
* @param array $array array(search in)
* @param array $array search in as array
* @param string|int $key key (key to search in)
* @param string|int $value value (what to find)
* @return bool true on found, false on not found
@@ -313,7 +313,7 @@ class ArrayHandler
/**
* searches for key -> value in an array tree and writes the value one level up
* this will remove this leaf will all other values
* @param array $array array(nested)
* @param array $array nested array
* @param string|int $search key to find that has no sub leaf and will be pushed up
* @return array modified, flattened array
*/
+6 -6
View File
@@ -190,8 +190,8 @@ class DateTime
list ($start_year, $start_month, $start_day) = array_pad(preg_split('/[\/-]/', $start_date), 3, null);
list ($end_year, $end_month, $end_day) = array_pad(preg_split('/[\/-]/', $end_date), 3, null);
// check that month & day are two digits and then combine
foreach (array('start', 'end') as $prefix) {
foreach (array('month', 'day') as $date_part) {
foreach (['start', 'end'] as $prefix) {
foreach (['month', 'day'] as $date_part) {
$_date = $prefix.'_'.$date_part;
if (isset($$_date) && $$_date < 10 && !preg_match("/^0/", $$_date)) {
$$_date = '0'.$$_date;
@@ -199,7 +199,7 @@ class DateTime
}
$_date = $prefix.'_date';
$$_date = '';
foreach (array('year', 'month', 'day') as $date_part) {
foreach (['year', 'month', 'day'] as $date_part) {
$_sub_date = $prefix.'_'.$date_part;
$$_date .= $$_sub_date;
}
@@ -254,7 +254,7 @@ class DateTime
public static function calcDaysInterval($start_date, $end_date, bool $return_named = false): array
{
// pos 0 all, pos 1 weekday, pos 2 weekend
$days = array();
$days = [];
$start = new \DateTime($start_date);
$end = new \DateTime($end_date);
// so we include the last day too, we need to add +1 second in the time
@@ -275,11 +275,11 @@ class DateTime
}
}
if ($return_named === true) {
return array(
return [
'overall' => $days[0],
'weekday' => $days[1],
'weekend' => $days[2]
);
];
} else {
return $days;
}