feat: self update only to next minor version

src/Classes/IndexController.php

@@ -16,8 +16,6 @@
 use RobinTheHood\ModifiedModuleLoaderClient\Loader\ModuleLoader;
 use RobinTheHood\ModifiedModuleLoaderClient\Loader\LocalModuleLoader;
 use RobinTheHood\ModifiedModuleLoaderClient\Loader\RemoteModuleLoader;
-use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
-use RobinTheHood\ModifiedModuleLoaderClient\Semver\Parser;
 use RobinTheHood\ModifiedModuleLoaderClient\ModuleFilter;
 use RobinTheHood\ModifiedModuleLoaderClient\ModuleSorter;
 use RobinTheHood\ModifiedModuleLoaderClient\Category;
@@ -137,36 +135,32 @@ public function invokeSelfUpdate()
             return $accessRedirect;
         }
 
-        $selfUpdater = new SelfUpdater();
-        $installedVersion = $selfUpdater->getInstalledVersion();
+        // Nächste mögliche MMLC Version ermittlen
         $latest = Config::getSelfUpdate() == 'latest';
-        $version = $selfUpdater->getNewestVersionInfo($latest);
+        $installedMmlcVersionString = App::getMmlcVersion();
+        $selfUpdater = new SelfUpdater(MmlcVersionInfoLoader::createLoader());
+        $mmlcVersionInfo = $selfUpdater->getNextMmlcVersionInfo($installedMmlcVersionString, $latest);
 
+        // Update durchführen, wenn ausgewählt und vorhanden
         $queryParams = $this->serverRequest->getQueryParams();
         $installVersion = $queryParams['install'] ?? '';
-
-        if ($installVersion) {
-            $selfUpdater->update($installVersion);
+        if ($mmlcVersionInfo && $mmlcVersionInfo->version === $installVersion) {
+            $selfUpdater->update($mmlcVersionInfo);
             return $this->redirect('/?action=selfUpdate');
         }
 
-        // Postupdate ausführen, falls erforderlich
-        $executed = $selfUpdater->checkAndDoPostUpdate();
+        // Postupdate ausführen. Kann immer aufgerufen werden. Die Methode entscheidet selbst,
+        // ob etwas getan werden muss oder nicht.
+        $postUpdateExecuted = $selfUpdater->postUpdate();
 
-        // Wenn der Postupdate durchgeführt werden musste, die Seite noch einmal
-        // automatisch neu laden
-        if ($executed) {
+        // Wenn ein Postupdate durchgeführt wurde, die Seite noch einmal automatisch neu laden.
+        if ($postUpdateExecuted) {
             return $this->redirect('/?action=selfUpdate');
         }
 
-        $checkUpdate = $selfUpdater->checkUpdate();
-
-        $comparator = new Comparator(new Parser());
-
         return $this->render('SelfUpdate', [
-            'comparator' => $comparator,
-            'version' => $version,
-            'installedVersion' => $installedVersion,
+            'mmlcVersionInfo' => $mmlcVersionInfo,
+            'installedVersionString' => $installedMmlcVersionString,
             'serverName' => $_SERVER['SERVER_NAME'] ?? 'unknown Server Name'
         ]);
     }
@@ -645,8 +639,11 @@ public function calcModuleChangeCount()
 
     public function calcSystemUpdateCount()
     {
-        $selfUpdater = new SelfUpdater();
-        $checkUpdate = $selfUpdater->checkUpdate();
+        $latest = Config::getSelfUpdate() == 'latest';
+        $installedMmlcVersionString = App::getMmlcVersion();
+
+        $selfUpdater = new SelfUpdater(MmlcVersionInfoLoader::createLoader());
+        $checkUpdate = $selfUpdater->updateAvailable($installedMmlcVersionString, $latest);
         if ($checkUpdate) {
             return 1;
         }

src/Classes/MmlcVersionInfo.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of MMLC - ModifiedModuleLoaderClient.
+ *
+ * (c) Robin Wieschendorf <mail@robinwieschendorf.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace RobinTheHood\ModifiedModuleLoaderClient;
+
+class MmlcVersionInfo
+{
+    /** @var string */
+    public $version;
+
+    /** @var string */
+    public $fileName;
+}

src/Classes/MmlcVersionInfoLoader.php

@@ -0,0 +1,170 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of MMLC - ModifiedModuleLoaderClient.
+ *
+ * (c) Robin Wieschendorf <mail@robinwieschendorf.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace RobinTheHood\ModifiedModuleLoaderClient;
+
+use RobinTheHood\ModifiedModuleLoaderClient\Api\V1\ApiRequest;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Filter;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\ParseErrorException;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Parser;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Sorter;
+
+class MmlcVersionInfoLoader
+{
+    /** @var ApiRequest */
+    private $apiRequest;
+
+    /** @var Parser */
+    private $parser;
+
+    /** @var Filter */
+    private $filter;
+
+    public static function createLoader(): MmlcVersionInfoLoader
+    {
+        $parser = new Parser();
+        $comparator = new Comparator($parser);
+        $sorter = new Sorter($comparator);
+        $filter = new Filter($parser, $comparator, $sorter);
+
+        $mmlcVersionInfoLoader = new MmlcVersionInfoLoader(
+            new ApiRequest(),
+            $parser,
+            $filter
+        );
+
+        return $mmlcVersionInfoLoader;
+    }
+
+    public function __construct(ApiRequest $apiRequest, Parser $parser, Filter $filter)
+    {
+        $this->apiRequest = $apiRequest;
+        $this->parser = $parser;
+        $this->filter = $filter;
+    }
+
+    /**
+     * Fetch all MmlcVersionInfo via api from MMLS
+     *
+     * @return MmlcVersionInfo[] all available MmlcVersionInfo
+     */
+    public function getAll(): array
+    {
+        $result = $this->apiRequest->getAllVersions();
+
+        $content = $result['content'] ?? [];
+        if (!$content) {
+            return [];
+        }
+
+        $mmlcVersionInfos = [];
+        foreach ($content as $mmlcVersionInfoAsArray) {
+            if (!array_key_exists('version', $mmlcVersionInfoAsArray)) {
+                continue;
+            }
+
+            if (!array_key_exists('fileName', $mmlcVersionInfoAsArray)) {
+                continue;
+            }
+
+            try {
+                $this->parser->parse($mmlcVersionInfoAsArray['version']);
+            } catch (ParseErrorException $e) {
+                continue;
+            }
+
+            $mmlcVersionInfo = new MmlcVersionInfo();
+            $mmlcVersionInfo->version = $mmlcVersionInfoAsArray['version'];
+            $mmlcVersionInfo->fileName = $mmlcVersionInfoAsArray['fileName'];
+            $mmlcVersionInfos[] = $mmlcVersionInfo;
+        }
+        return $mmlcVersionInfos;
+    }
+
+    /**
+     * Returns the latest MmlcVersionInfo
+     *
+     * @param bool $latest
+     *
+     * @return ?MmlcVersionInfo Returns the latest MmlcVersionInfo
+     */
+    public function getNewest($latest = false): ?MmlcVersionInfo
+    {
+        $mmlcVersionInfos = $this->getAll();
+        $versionStrings = $this->getVersionStringsFromMmlcVersionInfos($mmlcVersionInfos);
+
+        if (!$latest) {
+            $versionStrings = $this->filter->stable($versionStrings);
+        }
+
+        $versionString = $this->filter->latest($versionStrings);
+        $mmlcVersionInfo = $this->getMmlcVersionInfoByVersionString($versionString, $mmlcVersionInfos);
+
+        return $mmlcVersionInfo;
+    }
+
+    /**
+     * @param string $installtedVersionString
+     * @param bool $$latest
+     *
+     * @return ?MmlcVersionInfo
+     */
+    public function getNextNewest(string $installtedVersionString, bool $latest = false): ?MmlcVersionInfo
+    {
+        $versionInfos = $this->getAll();
+        $versionStrings = $this->getVersionStringsFromMmlcVersionInfos($versionInfos);
+
+        if (!$latest) {
+            $versionStrings = $this->filter->stable($versionStrings);
+        }
+
+        $version = $this->parser->parse($installtedVersionString);
+        $constrain = '<=' . $version->nextMinor();
+
+        $versionString = $this->filter->latestByConstraint($constrain, $versionStrings);
+        $versionInfo = $this->getMmlcVersionInfoByVersionString($versionString, $versionInfos);
+
+        return $versionInfo;
+    }
+
+    /**
+     * @param string $versionString
+     * @param MmlcVersionInfo[] $mmlcVersionInfos
+     *
+     * @return ?MmlcVersionInfo
+     */
+    private function getMmlcVersionInfoByVersionString(string $versionString, array $mmlcVersionInfos): ?MmlcVersionInfo
+    {
+        foreach ($mmlcVersionInfos as $mmlcVersionInfo) {
+            if ($mmlcVersionInfo->version === $versionString) {
+                return $mmlcVersionInfo;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param MmlcVersionInfo[] $mmlcVersionInfos
+     *
+     * @return string[]
+     */
+    private function getVersionStringsFromMmlcVersionInfos(array $mmlcVersionInfos): array
+    {
+        $versionStrings = [];
+        foreach ($mmlcVersionInfos as $mmlcVersionInfo) {
+            $versionStrings[] = $mmlcVersionInfo->version;
+        }
+        return $versionStrings;
+    }
+}