From 24efad74099045f0c15396cb48cf998075c57b3f Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Sat, 10 Nov 2018 21:56:34 +0100
Subject: [PATCH] * [FIX] Fixed wrong config version checking

Signed-off-by: nuxsmin <nuxsmin@syspass.org>
---
 app/modules/api/Init.php                         | 3 +++
 lib/SP/Bootstrap.php                             | 2 ++
 lib/SP/Services/Upgrade/UpgradeConfigService.php | 2 +-
 lib/SP/Util/VersionUtil.php                      | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/modules/api/Init.php b/app/modules/api/Init.php
index 61648565..80de32cd 100644
--- a/app/modules/api/Init.php
+++ b/app/modules/api/Init.php
@@ -133,7 +133,10 @@ final class Init extends ModuleBase
      * Comprobar si es necesario actualizar componentes
      *
      * @throws InitializationException
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException
+     * @throws \SP\Storage\File\FileException
      */
     private function checkUpgrade()
     {
diff --git a/lib/SP/Bootstrap.php b/lib/SP/Bootstrap.php
index 16c754eb..fcc8316c 100644
--- a/lib/SP/Bootstrap.php
+++ b/lib/SP/Bootstrap.php
@@ -389,6 +389,7 @@ final class Bootstrap
      *
      * @throws ConfigException
      * @throws Services\Upgrade\UpgradeException
+     * @throws Storage\File\FileException
      * @throws \DI\DependencyException
      * @throws \DI\NotFoundException
      */
@@ -403,6 +404,7 @@ final class Bootstrap
      * Comprobar la versión de configuración y actualizarla
      *
      * @throws Services\Upgrade\UpgradeException
+     * @throws Storage\File\FileException
      * @throws \DI\DependencyException
      * @throws \DI\NotFoundException
      */
diff --git a/lib/SP/Services/Upgrade/UpgradeConfigService.php b/lib/SP/Services/Upgrade/UpgradeConfigService.php
index c2925841..23e40e01 100644
--- a/lib/SP/Services/Upgrade/UpgradeConfigService.php
+++ b/lib/SP/Services/Upgrade/UpgradeConfigService.php
@@ -54,7 +54,7 @@ final class UpgradeConfigService extends Service implements UpgradeInterface
      */
     public static function needsUpgrade($version)
     {
-        return VersionUtil::checkVersion(VersionUtil::checkVersion($version, VersionUtil::getVersionArrayNormalized()), self::UPGRADES);
+        return VersionUtil::checkVersion($version, self::UPGRADES);
     }
 
     /**
diff --git a/lib/SP/Util/VersionUtil.php b/lib/SP/Util/VersionUtil.php
index 9bdb351d..343bdad8 100644
--- a/lib/SP/Util/VersionUtil.php
+++ b/lib/SP/Util/VersionUtil.php
@@ -54,7 +54,7 @@ final class VersionUtil
     public static function checkVersion($currentVersion, $upgradeableVersion)
     {
         if (is_array($upgradeableVersion)) {
-            $upgradeableVersion = $upgradeableVersion[count($upgradeableVersion) - 1];
+            $upgradeableVersion = array_pop($upgradeableVersion);
         }
 
         $currentVersion = self::normalizeVersionForCompare($currentVersion);