From 9cfab5a7ea4184eb110d35be593ee25d494ab73c Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 23 Sep 2020 10:17:07 +0300 Subject: [PATCH] upgrade fix --- .../Espo/Core/Console/Commands/Upgrade.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/application/Espo/Core/Console/Commands/Upgrade.php b/application/Espo/Core/Console/Commands/Upgrade.php index 8219e729c8..300236cd46 100644 --- a/application/Espo/Core/Console/Commands/Upgrade.php +++ b/application/Espo/Core/Console/Commands/Upgrade.php @@ -140,8 +140,7 @@ class Upgrade extends Base fwrite(\STDOUT, "\n"); - $app = new \Espo\Core\Application(); - $currentVerison = $app->getContainer()->get('config')->get('version'); + $currentVerison = $this->getCurrentVersion(); fwrite(\STDOUT, "Upgrade is complete. Current version is {$currentVerison}.\n"); @@ -211,8 +210,7 @@ class Upgrade extends Base return; } - $app = new \Espo\Core\Application(); - $currentVerison = $app->getContainer()->get('config')->get('version'); + $currentVerison = $this->getCurrentVersion(); fwrite(\STDOUT, "Upgrade is complete. Current version is {$currentVerison}.\n"); @@ -406,4 +404,15 @@ class Upgrade extends Base return true; } + + protected function getCurrentVersion() + { + $configData = include "data/config.php"; + + if (!$configData) { + return null; + } + + return $configData['version'] ?? null; + } }