viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 15:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix util array to object to preserve lists

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-09-27 09:49:14 +03:00
parent fba191f22c
commit cd92e4fcd8
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/Espo/Core/Utils/Util.php
View File

@@ -305,8 +305,17 @@ class Util
*/
private static function arrayToObjectInternal($value)
{
if (is_array($value)) {
return (object) array_map(fn($v) => self::arrayToObjectInternal($v), $value);
if (!is_array($value)) {
return $value;
}
// @todo Change to `array_is_list` when PHP 8.1 is the min supported.
$isList = $value === array_values($value);
$value = array_map(fn($v) => self::arrayToObjectInternal($v), $value);
if (!$isList) {
$value = (object) $value;
}
return $value;

38
tests/unit/Espo/Core/Utils/UtilTest.php
View File

@@ -1072,27 +1072,35 @@ class UtilTest extends \PHPUnit\Framework\TestCase
$this->assertEquals($result, Util::concatPath($input));
}
public function testArrayToObject()
public function testArrayToObject(): void
{
$testArr= array(
$testArr= [
'useCache' => true,
'sub' => array (
'sub' => [
'subV' => '125',
'subO' => array(
'subO' => [
'subOV' => '125',
),
),
);
],
'subList' => [
'0',
'1'
],
],
];
$testResult= (object) array(
$testResult= (object) [
'useCache' => true,
);
$testResult->sub = (object) array (
'subV' => '125',
);
$testResult->sub->subO = (object) array (
'subOV' => '125',
);
];
$testResult->sub = (object) [
'subV' => '125',
];
$testResult->sub->subO = (object) [
'subOV' => '125',
];
$testResult->sub->subList = ['0', '1'];
$this->assertEquals($testResult, Util::arrayToObject($testArr));
}