projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NFC] minor form cleanup.
[civicrm-core.git]
/
CRM
/
Utils
/
Array.php
diff --git
a/CRM/Utils/Array.php
b/CRM/Utils/Array.php
index 1a3d8a002072b1cab93d60e1a9bf724d69bb6718..14563ccabe757d15bf3f1d535290189330795416 100644
(file)
--- a/
CRM/Utils/Array.php
+++ b/
CRM/Utils/Array.php
@@
-569,10
+569,10
@@
class CRM_Utils_Array {
$node = &$result;
foreach ($keys as $key) {
if (is_array($record)) {
$node = &$result;
foreach ($keys as $key) {
if (is_array($record)) {
- $keyvalue =
isset($record[$key]) ? $record[$key] :
NULL;
+ $keyvalue =
$record[$key] ??
NULL;
}
else {
}
else {
- $keyvalue =
isset($record->{$key}) ? $record->{$key} :
NULL;
+ $keyvalue =
$record->{$key} ??
NULL;
}
if (isset($node[$keyvalue]) && !is_array($node[$keyvalue])) {
$node[$keyvalue] = [];
}
if (isset($node[$keyvalue]) && !is_array($node[$keyvalue])) {
$node[$keyvalue] = [];
@@
-915,7
+915,7
@@
class CRM_Utils_Array {
foreach ($matrix as $pos => $oldRow) {
$newRow = [];
foreach ($columns as $column) {
foreach ($matrix as $pos => $oldRow) {
$newRow = [];
foreach ($columns as $column) {
- $newRow[$column] =
CRM_Utils_Array::value($column, $oldRow)
;
+ $newRow[$column] =
$oldRow[$column] ?? NULL
;
}
$newRows[$pos] = $newRow;
}
}
$newRows[$pos] = $newRow;
}