From feba3cd05ead3474eaf099b270263be33bcf3d19 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 21 Sep 2020 12:02:54 +0300 Subject: [PATCH] fix varexport --- application/Espo/Core/Utils/File/Manager.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/application/Espo/Core/Utils/File/Manager.php b/application/Espo/Core/Utils/File/Manager.php index b05e6ed9e5..e195fa16bb 100644 --- a/application/Espo/Core/Utils/File/Manager.php +++ b/application/Espo/Core/Utils/File/Manager.php @@ -927,7 +927,7 @@ class Manager "return " . $this->varExport($content) . ";\n"; } - protected function varExport($variable, $level = 0) + protected function varExport($variable, int $level = 0) { $tab = ''; $tabElement = ' '; @@ -939,22 +939,24 @@ class Manager $prevTab = substr($tab, 0, strlen($tab) - strlen($tabElement)); if ($variable instanceof StdClass) { - $result = "(object) " . $this->varExport(get_object_vars($variable), $level); + return "(object) " . $this->varExport(get_object_vars($variable), $level); } - else if (is_array($variable)) { + + if (is_array($variable)) { $array = []; foreach ($variable as $key => $value) { $array[] = var_export($key, true) . " => " . $this->varExport($value, $level + 1); } - $result = "[\n" . $tab . implode(",\n" . $tab, $array) . "\n" . $prevTab . "]"; - } - else { - $result = var_export($variable, true); + if (count($array) === 0) { + return "[]"; + } + + return "[\n" . $tab . implode(",\n" . $tab, $array) . "\n" . $prevTab . "]"; } - return $result; + return var_export($variable, true); } /**