From 93d4162d4f5da2a152623fc5b22d07395de4237b Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Tue, 21 Mar 2023 21:20:34 +0100
Subject: [PATCH 01/12] feat: add new methods to Comparator and add tests

- filterVerionsByConstraint()
- getLatestVersionByConstraint()
- getOldestVersionByConstraint()
- filterStable()
---
 src/Classes/Semver/Comparator.php             | 45 ++++++++++
 .../unit/SemverTests/SemverComparatorTest.php | 90 ++++++++++++++++++-
 2 files changed, 133 insertions(+), 2 deletions(-)

diff --git a/src/Classes/Semver/Comparator.php b/src/Classes/Semver/Comparator.php
index a56c467d..b1450386 100644
--- a/src/Classes/Semver/Comparator.php
+++ b/src/Classes/Semver/Comparator.php
@@ -215,6 +215,51 @@ public function rsort(array $versionStrings): array
         return $versionStrings;
     }
 
+    public function filterVersionsByConstraint(string $constraint, array $versions): array
+    {
+        $fileredVersions = [];
+        foreach ($versions as $version) {
+            if ($this->satisfiesOr($version, $constraint)) {
+                $fileredVersions[] = $version;
+            }
+        }
+        return $fileredVersions;
+    }
+
+    public function getLatestVersionByConstraint(string $constraint, array $versions): string
+    {
+        $filteredVersions = $this->filterVersionsByConstraint($constraint, $versions);
+        if (!$filteredVersions) {
+            return '';
+        }
+        $filteredVersions = $this->rsort($filteredVersions);
+
+        return $filteredVersions[0] ?? '';
+    }
+
+    public function getOldestVersionByConstraint(string $constraint, array $versions): string
+    {
+        $filteredVersions = $this->filterVersionsByConstraint($constraint, $versions);
+        if (!$filteredVersions) {
+            return '';
+        }
+        $filteredVersions = $this->sort($filteredVersions);
+
+        return $filteredVersions[0] ?? '';
+    }
+
+    public function filterStable(array $versionStrings): array
+    {
+        $fileredVersionStrings = [];
+        foreach ($versionStrings as $versionString) {
+            $version = $this->parser->parse($versionString);
+            if (!$version->getTag()) {
+                $fileredVersionStrings[] = $versionString;
+            }
+        }
+        return $fileredVersionStrings;
+    }
+
     private function compareAsc(string $versionString1, string $versionString2): int
     {
         if ($this->greaterThan($versionString1, $versionString2)) {
diff --git a/tests/unit/SemverTests/SemverComparatorTest.php b/tests/unit/SemverTests/SemverComparatorTest.php
index 70d0f5fc..f58746ab 100644
--- a/tests/unit/SemverTests/SemverComparatorTest.php
+++ b/tests/unit/SemverTests/SemverComparatorTest.php
@@ -188,7 +188,7 @@ public function testThatVersionAIsCompatibleWithVersionB()
         $this->assertFalse($this->comparator->isCompatible('3.3.3', '3.3.4'));
     }
 
-    public function testThatVersionASatisfiesContraint()
+    public function testThatVersionASatisfiesConstraint()
     {
         $this->assertTrue($this->comparator->satisfies('3.3.3', '^3.3.3'));
         $this->assertTrue($this->comparator->satisfies('3.3.3', '^3.2.3'));
@@ -196,9 +196,95 @@ public function testThatVersionASatisfiesContraint()
         $this->assertFalse($this->comparator->satisfies('3.3.3', '3.2.3'));
     }
 
-    public function testThatVersionASatisfiesOrContraint()
+    public function testThatVersionASatisfiesOrConstraint()
     {
         $this->assertTrue($this->comparator->satisfiesOr('3.3.3', '^2.2.2 || ^3.3.3'));
         $this->assertFalse($this->comparator->satisfiesOr('4.4.4', '^2.2.2 || ^3.3.3'));
     }
+
+    public function testCanFilterVerionsByConstraint()
+    {
+        $versions = [
+            '17.111.9',
+            '1.2.3',
+            '18.22.10',
+            '18.33.10',
+            '18.22.9',
+            '19.1.0',
+            '19.0.0'
+        ];
+
+        $resultVersions = [
+            '18.22.10',
+            '18.33.10',
+            '18.22.9'
+        ];
+
+        $this->assertEquals($resultVersions, $this->comparator->filterVersionsByConstraint('^18.0.0', $versions));
+
+        $resultVersions = [
+            '19.1.0',
+            '19.0.0'
+        ];
+
+        $this->assertEquals($resultVersions, $this->comparator->filterVersionsByConstraint('^19.0.0', $versions));
+    }
+
+    public function testCanGetLatestVersionByConstraint()
+    {
+        $versions = [
+            '17.111.9',
+            '1.2.3',
+            '18.22.10',
+            '18.33.10',
+            '18.22.9',
+            '19.1.0',
+            '19.0.0',
+            '19.0.0-beta.1'
+        ];
+
+        $this->assertEquals('', $this->comparator->getLatestVersionByConstraint('^0.0.0', $versions));
+        $this->assertEquals('', $this->comparator->getLatestVersionByConstraint('^2.0.0', $versions));
+        $this->assertEquals('18.33.10', $this->comparator->getLatestVersionByConstraint('^18.0.0', $versions));
+        $this->assertEquals('19.1.0', $this->comparator->getLatestVersionByConstraint('^19.0.0', $versions));
+    }
+
+    public function testCanGetOldestVersionByConstraint()
+    {
+        $versions = [
+            '17.111.9',
+            '1.2.3',
+            '18.22.10',
+            '18.33.10',
+            '18.22.9',
+            '19.1.0',
+            '19.0.0',
+            '19.0.0-beta.1'
+        ];
+
+        $this->assertEquals('', $this->comparator->getOldestVersionByConstraint('^0.0.0', $versions));
+        $this->assertEquals('', $this->comparator->getOldestVersionByConstraint('^2.0.0', $versions));
+        $this->assertEquals('18.22.9', $this->comparator->getOldestVersionByConstraint('^18.0.0', $versions));
+        $this->assertEquals('19.0.0-beta.1', $this->comparator->getOldestVersionByConstraint('^19.0.0-beta', $versions));
+        $this->assertEquals('19.0.0', $this->comparator->getOldestVersionByConstraint('^19.0.0', $versions));
+    }
+
+    public function testCanFilterStableVersions()
+    {
+        $versions = [
+            '18.33.10',
+            '19.0.0-beta.1',
+            '18.22.9',
+            '19.1.0-alpha.1',
+            '19.0.0'
+        ];
+
+        $resultVersions = [
+            '18.33.10',
+            '18.22.9',
+            '19.0.0'
+        ];
+
+        $this->assertEquals($resultVersions, $this->comparator->filterStable($versions));
+    }
 }

From b2a1de669c754bab03d594e8c7fa19a41d35fadf Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Tue, 21 Mar 2023 21:21:34 +0100
Subject: [PATCH 02/12] feat: add "<=" to Comperator::satisfies()

---
 src/Classes/Semver/Comparator.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Classes/Semver/Comparator.php b/src/Classes/Semver/Comparator.php
index b1450386..4b9b736c 100644
--- a/src/Classes/Semver/Comparator.php
+++ b/src/Classes/Semver/Comparator.php
@@ -180,6 +180,9 @@ public function satisfies(string $versionString1, string $constrain): bool
         if ($constrain[0] == '^') { // Ist Buchstabe an Index 0 = ^
             $versionString2 = str_replace('^', '', $constrain);
             return $this->isCompatible($versionString1, $versionString2);
+        } elseif ($constrain[0] == '<' && $constrain[1] == '=') {
+            $versionString2 = str_replace('<=', '', $constrain);
+            return $this->lessThanOrEqualTo($versionString1, $versionString2);
         } else {
             $versionString2 = $constrain;
             return $this->equalTo($versionString1, $versionString2);

From d5cf880c5280e47bd2d051ea5767468402745b2f Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Tue, 21 Mar 2023 21:23:44 +0100
Subject: [PATCH 03/12] feat: add method getNextNewestVersionInfo() to
 SelfUpdater() and add tests

---
 src/Classes/SelfUpdater.php    | 43 ++++++++++++++++
 tests/unit/SelfUpdaterTest.php | 93 ++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/src/Classes/SelfUpdater.php b/src/Classes/SelfUpdater.php
index ec85bf6d..8643f238 100644
--- a/src/Classes/SelfUpdater.php
+++ b/src/Classes/SelfUpdater.php
@@ -21,6 +21,7 @@
 use RobinTheHood\ModifiedModuleLoaderClient\Helpers\FileHelper;
 use RobinTheHood\ModifiedModuleLoaderClient\Api\V1\HttpRequest;
 use RobinTheHood\ModifiedModuleLoaderClient\Api\V1\ApiRequest;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Version;
 
 class SelfUpdater
 {
@@ -140,6 +141,48 @@ public function getNewestVersionInfo($latest = false): array
         return $newestVersionInfo;
     }
 
+    public function getNextNewestVersionInfo(bool $latest = false): array
+    {
+        $versionInfos = $this->getVersionInfos();
+        $versionStrings = $this->getVersionStringsFromVersionInfos($versionInfos);
+
+        if (!$latest) {
+            $versionStrings = $this->comparator->filterStable($versionStrings);
+        }
+
+        $installtedVersionString = $this->getInstalledVersion();
+        $version = $this->parser->parse($installtedVersionString);
+
+        $constrain = '<=' . $version->getMajor() . '.' . ($version->getMinor() + 1) . '.0';
+
+        $versionString = $this->comparator->getLatestVersionByConstraint($constrain, $versionStrings);
+        $versionInfo = $this->getVersionInfoByVersionString($versionString, $versionInfos);
+
+        return $versionInfo;
+    }
+
+    private function getVersionInfoByVersionString($versionString, array $versionInfos): array
+    {
+        foreach ($versionInfos as $versionInfo) {
+            if ($versionInfo['version'] === $versionString) {
+                return $versionInfo;
+            }
+        }
+        return [];
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getVersionStringsFromVersionInfos(array $versionInfos): array
+    {
+        $versionStrings = [];
+        foreach ($versionInfos as $versionInfo) {
+            $versionStrings[] = $versionInfo['version'];
+        }
+        return $versionStrings;
+    }
+
     private function getFileNameByVersion(string $version): string
     {
         $versionInfos = $this->getVersionInfos();
diff --git a/tests/unit/SelfUpdaterTest.php b/tests/unit/SelfUpdaterTest.php
index feca0f9c..79f96108 100644
--- a/tests/unit/SelfUpdaterTest.php
+++ b/tests/unit/SelfUpdaterTest.php
@@ -47,6 +47,63 @@ public function getStubedApiRequest()
         return $stubApiRequest;
     }
 
+    public function getStubedSelfUpdater()
+    {
+        /** @var MockObject $stubSelfUpdater */
+        $stubSelfUpdater = $this->getMockBuilder(SelfUpdater::class)
+            ->onlyMethods(['getVersionInfos', 'getInstalledVersion'])
+            ->getMock();
+
+        $stubSelfUpdater->method('getVersionInfos')->willReturn([
+            [
+                'version' => '1.1.1-alpha',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.1.1-alpha.tar'
+            ],
+            [
+                'version' => '1.1.2-alpha',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.1.2-alpha.tar'
+            ],
+            [
+                'version' => '1.1.2',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.1.2.tar'
+            ],
+            [
+                'version' => '1.1.3-alpha',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.1.3-alpha.tar'
+            ],
+            [
+                'version' => '1.2.0',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.2.0.tar'
+            ],
+            [
+                'version' => '1.2.1',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.2.1.tar'
+            ],
+            [
+                'version' => '1.3.0-beta.1',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.3.0-beta.1.tar'
+            ],
+            [
+                'version' => '1.3.0',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.3.0.tar'
+            ],
+            [
+                'version' => '1.3.1',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.3.1.tar'
+            ],
+            [
+                'version' => '2.0.0',
+                'fileName' => 'ModifiedModuleLoaderClient_v2.0.0.tar'
+            ],
+            [
+                'version' => '2.1.0',
+                'fileName' => 'ModifiedModuleLoaderClient_v2.1.0.tar'
+            ]
+        ]);
+
+        return $stubSelfUpdater;
+    }
+
     public function testGetInstalledVersion()
     {
         $selfUpdater = new SelfUpdater();
@@ -112,4 +169,40 @@ public function testGetVersionInfos()
 
         $this->assertEquals($expects, $versionInfos);
     }
+
+    public function testCanGetNextNewestPathVersionInfo()
+    {
+        // 1.1.0 to 1.2.0
+        $selfUpdater = $this->getStubedSelfUpdater();
+        $selfUpdater->method('getInstalledVersion')->willReturn('1.1.0');
+        $this->assertEquals(
+            [
+                'version' => '1.2.0',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.2.0.tar'
+            ],
+            $selfUpdater->getNextNewestVersionInfo()
+        );
+
+        // 1.2.0 to 1.3.0
+        $selfUpdater = $this->getStubedSelfUpdater();
+        $selfUpdater->method('getInstalledVersion')->willReturn('1.2.0');
+        $this->assertEquals(
+            [
+                'version' => '1.3.0',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.3.0.tar'
+            ],
+            $selfUpdater->getNextNewestVersionInfo()
+        );
+
+        // 1.3.0 to 1.3.1
+        $selfUpdater = $this->getStubedSelfUpdater();
+        $selfUpdater->method('getInstalledVersion')->willReturn('1.3.0');
+        $this->assertEquals(
+            [
+                'version' => '1.3.1',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.3.1.tar'
+            ],
+            $selfUpdater->getNextNewestVersionInfo()
+        );
+    }
 }

From 1ded29e5fc569ee33654846650ad8cee3639da9a Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Tue, 21 Mar 2023 23:53:58 +0100
Subject: [PATCH 04/12] feat: add and use new Semver classes

- Filter
- Sorter
---
 src/Classes/SelfUpdater.php       | 10 +++-
 src/Classes/Semver/Comparator.php | 45 ----------------
 src/Classes/Semver/Filter.php     | 85 +++++++++++++++++++++++++++++++
 src/Classes/Semver/Sorter.php     | 55 ++++++++++++++++++++
 4 files changed, 148 insertions(+), 47 deletions(-)
 create mode 100644 src/Classes/Semver/Filter.php
 create mode 100644 src/Classes/Semver/Sorter.php

diff --git a/src/Classes/SelfUpdater.php b/src/Classes/SelfUpdater.php
index 8643f238..47910890 100644
--- a/src/Classes/SelfUpdater.php
+++ b/src/Classes/SelfUpdater.php
@@ -21,6 +21,8 @@
 use RobinTheHood\ModifiedModuleLoaderClient\Helpers\FileHelper;
 use RobinTheHood\ModifiedModuleLoaderClient\Api\V1\HttpRequest;
 use RobinTheHood\ModifiedModuleLoaderClient\Api\V1\ApiRequest;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Filter;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Sorter;
 use RobinTheHood\ModifiedModuleLoaderClient\Semver\Version;
 
 class SelfUpdater
@@ -45,6 +47,9 @@ class SelfUpdater
      */
     protected $parser;
 
+    /** @var Filter */
+    protected $filter;
+
     private $apiRequest;
 
     public function __construct($apiRequest = null)
@@ -66,6 +71,7 @@ public function __construct($apiRequest = null)
 
         $this->comparator = new Comparator(new Parser());
         $this->parser = new Parser();
+        $this->filter = new Filter($this->parser, $this->comparator, new Sorter($this->comparator));
     }
 
 
@@ -147,7 +153,7 @@ public function getNextNewestVersionInfo(bool $latest = false): array
         $versionStrings = $this->getVersionStringsFromVersionInfos($versionInfos);
 
         if (!$latest) {
-            $versionStrings = $this->comparator->filterStable($versionStrings);
+            $versionStrings = $this->filter->stable($versionStrings);
         }
 
         $installtedVersionString = $this->getInstalledVersion();
@@ -155,7 +161,7 @@ public function getNextNewestVersionInfo(bool $latest = false): array
 
         $constrain = '<=' . $version->getMajor() . '.' . ($version->getMinor() + 1) . '.0';
 
-        $versionString = $this->comparator->getLatestVersionByConstraint($constrain, $versionStrings);
+        $versionString = $this->filter->latestByConstraint($constrain, $versionStrings);
         $versionInfo = $this->getVersionInfoByVersionString($versionString, $versionInfos);
 
         return $versionInfo;
diff --git a/src/Classes/Semver/Comparator.php b/src/Classes/Semver/Comparator.php
index 4b9b736c..478060e4 100644
--- a/src/Classes/Semver/Comparator.php
+++ b/src/Classes/Semver/Comparator.php
@@ -218,51 +218,6 @@ public function rsort(array $versionStrings): array
         return $versionStrings;
     }
 
-    public function filterVersionsByConstraint(string $constraint, array $versions): array
-    {
-        $fileredVersions = [];
-        foreach ($versions as $version) {
-            if ($this->satisfiesOr($version, $constraint)) {
-                $fileredVersions[] = $version;
-            }
-        }
-        return $fileredVersions;
-    }
-
-    public function getLatestVersionByConstraint(string $constraint, array $versions): string
-    {
-        $filteredVersions = $this->filterVersionsByConstraint($constraint, $versions);
-        if (!$filteredVersions) {
-            return '';
-        }
-        $filteredVersions = $this->rsort($filteredVersions);
-
-        return $filteredVersions[0] ?? '';
-    }
-
-    public function getOldestVersionByConstraint(string $constraint, array $versions): string
-    {
-        $filteredVersions = $this->filterVersionsByConstraint($constraint, $versions);
-        if (!$filteredVersions) {
-            return '';
-        }
-        $filteredVersions = $this->sort($filteredVersions);
-
-        return $filteredVersions[0] ?? '';
-    }
-
-    public function filterStable(array $versionStrings): array
-    {
-        $fileredVersionStrings = [];
-        foreach ($versionStrings as $versionString) {
-            $version = $this->parser->parse($versionString);
-            if (!$version->getTag()) {
-                $fileredVersionStrings[] = $versionString;
-            }
-        }
-        return $fileredVersionStrings;
-    }
-
     private function compareAsc(string $versionString1, string $versionString2): int
     {
         if ($this->greaterThan($versionString1, $versionString2)) {
diff --git a/src/Classes/Semver/Filter.php b/src/Classes/Semver/Filter.php
new file mode 100644
index 00000000..d89b9abe
--- /dev/null
+++ b/src/Classes/Semver/Filter.php
@@ -0,0 +1,85 @@
+<?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\Semver;
+
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Parser;
+
+class Filter
+{
+    private $sorter;
+
+    private $comparator;
+
+    private $parser;
+
+    public function __construct(Parser $parser, Comparator $comparator, Sorter $sorter)
+    {
+        $this->parser = $parser;
+        $this->comparator = $comparator;
+        $this->sorter = $sorter;
+    }
+
+    public function latest(array $versionStrings): string
+    {
+        if (!$versionStrings) {
+            return '';
+        }
+        $versionStrings = $this->sorter->rsort($versionStrings);
+        return $versionStrings[0];
+    }
+
+    public function oldest(array $versionStrings): string
+    {
+        if (!$versionStrings) {
+            return '';
+        }
+        $versionStrings = $this->sorter->sort($versionStrings);
+        return $versionStrings[0];
+    }
+
+    public function byConstraint(string $constraint, array $versions): array
+    {
+        $fileredVersions = [];
+        foreach ($versions as $version) {
+            if ($this->comparator->satisfiesOr($version, $constraint)) {
+                $fileredVersions[] = $version;
+            }
+        }
+        return $fileredVersions;
+    }
+
+    public function latestByConstraint(string $constraint, array $versions): string
+    {
+        $filteredVersions = $this->byConstraint($constraint, $versions);
+        return $this->latest($filteredVersions);
+    }
+
+    public function oldestByConstraint(string $constraint, array $versions): string
+    {
+        $filteredVersions = $this->byConstraint($constraint, $versions);
+        return $this->oldest($filteredVersions);
+    }
+
+    public function stable(array $versionStrings): array
+    {
+        $fileredVersionStrings = [];
+        foreach ($versionStrings as $versionString) {
+            $version = $this->parser->parse($versionString);
+            if (!$version->getTag()) {
+                $fileredVersionStrings[] = $versionString;
+            }
+        }
+        return $fileredVersionStrings;
+    }
+}
diff --git a/src/Classes/Semver/Sorter.php b/src/Classes/Semver/Sorter.php
new file mode 100644
index 00000000..66a0bb47
--- /dev/null
+++ b/src/Classes/Semver/Sorter.php
@@ -0,0 +1,55 @@
+<?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\Semver;
+
+class Sorter
+{
+    /** @var Comparator */
+    private $comparator;
+
+    public function __construct(Comparator $comparator)
+    {
+        $this->comparator = $comparator;
+    }
+
+    public function sort(array $versionStrings): array
+    {
+        usort($versionStrings, [$this, 'compareAsc']);
+        return $versionStrings;
+    }
+
+    public function rsort(array $versionStrings): array
+    {
+        usort($versionStrings, [$this, 'compareDes']);
+        return $versionStrings;
+    }
+
+    private function compareAsc(string $versionString1, string $versionString2): int
+    {
+        if ($this->comparator->greaterThan($versionString1, $versionString2)) {
+            return 1;
+        }
+
+        return -1;
+    }
+
+    private function compareDes(string $versionString1, string $versionString2): int
+    {
+        if ($this->comparator->greaterThan($versionString1, $versionString2)) {
+            return -1;
+        }
+
+        return 1;
+    }
+}

From 2caacb620d4413946accc3f643c33b40b41d445a Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Wed, 22 Mar 2023 00:13:51 +0100
Subject: [PATCH 05/12] tests: add SemverSorterTest and SemverFilterTest

---
 tests/unit/SemverTests/SemverFilterTest.php | 145 ++++++++++++++++++++
 tests/unit/SemverTests/SemverSorterTest.php |  73 ++++++++++
 2 files changed, 218 insertions(+)
 create mode 100644 tests/unit/SemverTests/SemverFilterTest.php
 create mode 100644 tests/unit/SemverTests/SemverSorterTest.php

diff --git a/tests/unit/SemverTests/SemverFilterTest.php b/tests/unit/SemverTests/SemverFilterTest.php
new file mode 100644
index 00000000..078fb2e5
--- /dev/null
+++ b/tests/unit/SemverTests/SemverFilterTest.php
@@ -0,0 +1,145 @@
+<?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\Tests\Unit\SemverTests;
+
+use PHPUnit\Framework\TestCase;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Filter;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Parser;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Sorter;
+
+class SemverFilterTest extends TestCase
+{
+    /** @var Filter */
+    public $filter;
+
+    protected function setUp(): void
+    {
+        $parser = new Parser();
+        $comparator = new Comparator($parser);
+        $this->filter = new Filter($parser, new Comparator($parser), new Sorter($comparator));
+    }
+
+    public function testSemverGetsHighestVersionString()
+    {
+        $versions = [
+            '17.111.9',
+            '1.2.3',
+            '18.22.10',
+            '18.33.10',
+            '18.22.9'
+        ];
+
+        $this->assertEquals('18.33.10', $this->filter->latest($versions));
+    }
+
+    public function testSemverGetsLowestVersionString()
+    {
+        $versions = [
+            '17.111.9',
+            '1.2.3',
+            '18.22.10',
+            '18.33.10',
+            '18.22.9'
+        ];
+
+        $this->assertEquals('1.2.3', $this->filter->oldest($versions));
+    }
+
+    public function testCanFilterByConstraint()
+    {
+        $versions = [
+            '17.111.9',
+            '1.2.3',
+            '18.22.10',
+            '18.33.10',
+            '18.22.9',
+            '19.1.0',
+            '19.0.0'
+        ];
+
+        $resultVersions = [
+            '18.22.10',
+            '18.33.10',
+            '18.22.9'
+        ];
+
+        $this->assertEquals($resultVersions, $this->filter->byConstraint('^18.0.0', $versions));
+
+        $resultVersions = [
+            '19.1.0',
+            '19.0.0'
+        ];
+
+        $this->assertEquals($resultVersions, $this->filter->byConstraint('^19.0.0', $versions));
+    }
+
+    public function testCanGetLatestByConstraint()
+    {
+        $versions = [
+            '17.111.9',
+            '1.2.3',
+            '18.22.10',
+            '18.33.10',
+            '18.22.9',
+            '19.1.0',
+            '19.0.0',
+            '19.0.0-beta.1'
+        ];
+
+        $this->assertEquals('', $this->filter->latestByConstraint('^0.0.0', $versions));
+        $this->assertEquals('', $this->filter->latestByConstraint('^2.0.0', $versions));
+        $this->assertEquals('18.33.10', $this->filter->latestByConstraint('^18.0.0', $versions));
+        $this->assertEquals('19.1.0', $this->filter->latestByConstraint('^19.0.0', $versions));
+    }
+
+    public function testCanGetOldestByConstraint()
+    {
+        $versions = [
+            '17.111.9',
+            '1.2.3',
+            '18.22.10',
+            '18.33.10',
+            '18.22.9',
+            '19.1.0',
+            '19.0.0',
+            '19.0.0-beta.1'
+        ];
+
+        $this->assertEquals('', $this->filter->oldestByConstraint('^0.0.0', $versions));
+        $this->assertEquals('', $this->filter->oldestByConstraint('^2.0.0', $versions));
+        $this->assertEquals('18.22.9', $this->filter->oldestByConstraint('^18.0.0', $versions));
+        $this->assertEquals('19.0.0-beta.1', $this->filter->oldestByConstraint('^19.0.0-beta', $versions));
+        $this->assertEquals('19.0.0', $this->filter->oldestByConstraint('^19.0.0', $versions));
+    }
+
+    public function testCanFilterStable()
+    {
+        $versions = [
+            '18.33.10',
+            '19.0.0-beta.1',
+            '18.22.9',
+            '19.1.0-alpha.1',
+            '19.0.0'
+        ];
+
+        $resultVersions = [
+            '18.33.10',
+            '18.22.9',
+            '19.0.0'
+        ];
+
+        $this->assertEquals($resultVersions, $this->filter->stable($versions));
+    }
+}
diff --git a/tests/unit/SemverTests/SemverSorterTest.php b/tests/unit/SemverTests/SemverSorterTest.php
new file mode 100644
index 00000000..92063b43
--- /dev/null
+++ b/tests/unit/SemverTests/SemverSorterTest.php
@@ -0,0 +1,73 @@
+<?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\Tests\Unit\SemverTests;
+
+use PHPUnit\Framework\TestCase;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Parser;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Sorter;
+
+class SemverSorterTest extends TestCase
+{
+    /** @var Sorter */
+    public $sorter;
+
+    protected function setUp(): void
+    {
+        $comparator = new Comparator(new Parser());
+        $this->sorter = new Sorter($comparator);
+    }
+
+    public function testSemverCanSortVersions()
+    {
+        $versions = [
+            '17.111.9',
+            '1.2.3',
+            '18.22.10',
+            '18.33.10',
+            '18.22.9'
+        ];
+
+        $expected = [
+            '1.2.3',
+            '17.111.9',
+            '18.22.9',
+            '18.22.10',
+            '18.33.10'
+        ];
+
+        $this->assertEquals($expected, $this->sorter->sort($versions));
+    }
+
+    public function testSemverCanSortReverseVersions()
+    {
+        $versions = [
+            '17.111.9',
+            '1.2.3',
+            '18.22.10',
+            '18.33.10',
+            '18.22.9'
+        ];
+
+        $expected = [
+            '18.33.10',
+            '18.22.10',
+            '18.22.9',
+            '17.111.9',
+            '1.2.3'
+        ];
+
+        $this->assertEquals($expected, $this->sorter->rsort($versions));
+    }
+}

From 43a7f065af7037c1177b053562aba72fc5f9b521 Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Wed, 22 Mar 2023 00:14:25 +0100
Subject: [PATCH 06/12] fix: Comparator and test

---
 src/Classes/Semver/Comparator.php             |  42 -----
 .../unit/SemverTests/SemverComparatorTest.php | 154 ------------------
 2 files changed, 196 deletions(-)

diff --git a/src/Classes/Semver/Comparator.php b/src/Classes/Semver/Comparator.php
index 478060e4..86b1598e 100644
--- a/src/Classes/Semver/Comparator.php
+++ b/src/Classes/Semver/Comparator.php
@@ -144,18 +144,6 @@ public function notEqualTo(string $versionString1, string $versionString2): bool
         return false;
     }
 
-    public function highest(array $versionStrings): string
-    {
-        $versionStrings = $this->rsort($versionStrings);
-        return $versionStrings[0];
-    }
-
-    public function lowest(array $versionStrings): string
-    {
-        $versionStrings = $this->sort($versionStrings);
-        return $versionStrings[0];
-    }
-
     // Testet ob Version1 mindestens das kann, was auch Version2 kann.
     // Version1 darf auch mehr können als das was Version2 kann,
     // aber nicht weniger.
@@ -205,34 +193,4 @@ public function satisfiesOr(string $versionString1, string $constraintOrExpressi
         }
         return false;
     }
-
-    public function sort(array $versionStrings): array
-    {
-        usort($versionStrings, [$this, 'compareAsc']);
-        return $versionStrings;
-    }
-
-    public function rsort(array $versionStrings): array
-    {
-        usort($versionStrings, [$this, 'compareDes']);
-        return $versionStrings;
-    }
-
-    private function compareAsc(string $versionString1, string $versionString2): int
-    {
-        if ($this->greaterThan($versionString1, $versionString2)) {
-            return 1;
-        }
-
-        return -1;
-    }
-
-    private function compareDes(string $versionString1, string $versionString2): int
-    {
-        if ($this->greaterThan($versionString1, $versionString2)) {
-            return -1;
-        }
-
-        return 1;
-    }
 }
diff --git a/tests/unit/SemverTests/SemverComparatorTest.php b/tests/unit/SemverTests/SemverComparatorTest.php
index f58746ab..9b4137f7 100644
--- a/tests/unit/SemverTests/SemverComparatorTest.php
+++ b/tests/unit/SemverTests/SemverComparatorTest.php
@@ -107,74 +107,6 @@ public function testSemverCanHandleNotEqualTo()
         $this->assertFalse($this->comparator->notEqualTo('1.2.3', '1.2.3'));
     }
 
-    public function testSemverCanSortVersions()
-    {
-        $versions = [
-            '17.111.9',
-            '1.2.3',
-            '18.22.10',
-            '18.33.10',
-            '18.22.9'
-        ];
-
-        $expected = [
-            '1.2.3',
-            '17.111.9',
-            '18.22.9',
-            '18.22.10',
-            '18.33.10'
-        ];
-
-        $this->assertEquals($expected, $this->comparator->sort($versions));
-    }
-
-    public function testSemverCanSortReverseVersions()
-    {
-        $versions = [
-            '17.111.9',
-            '1.2.3',
-            '18.22.10',
-            '18.33.10',
-            '18.22.9'
-        ];
-
-        $expected = [
-            '18.33.10',
-            '18.22.10',
-            '18.22.9',
-            '17.111.9',
-            '1.2.3'
-        ];
-
-        $this->assertEquals($expected, $this->comparator->rsort($versions));
-    }
-
-    public function testSemverGetsHighestVersionString()
-    {
-        $versions = [
-            '17.111.9',
-            '1.2.3',
-            '18.22.10',
-            '18.33.10',
-            '18.22.9'
-        ];
-
-        $this->assertEquals('18.33.10', $this->comparator->highest($versions));
-    }
-
-    public function testSemverGetsLowestVersionString()
-    {
-        $versions = [
-            '17.111.9',
-            '1.2.3',
-            '18.22.10',
-            '18.33.10',
-            '18.22.9'
-        ];
-
-        $this->assertEquals('1.2.3', $this->comparator->lowest($versions));
-    }
-
     public function testThatVersionAIsCompatibleWithVersionB()
     {
         $this->assertTrue($this->comparator->isCompatible('auto', '3.3.3'));
@@ -201,90 +133,4 @@ public function testThatVersionASatisfiesOrConstraint()
         $this->assertTrue($this->comparator->satisfiesOr('3.3.3', '^2.2.2 || ^3.3.3'));
         $this->assertFalse($this->comparator->satisfiesOr('4.4.4', '^2.2.2 || ^3.3.3'));
     }
-
-    public function testCanFilterVerionsByConstraint()
-    {
-        $versions = [
-            '17.111.9',
-            '1.2.3',
-            '18.22.10',
-            '18.33.10',
-            '18.22.9',
-            '19.1.0',
-            '19.0.0'
-        ];
-
-        $resultVersions = [
-            '18.22.10',
-            '18.33.10',
-            '18.22.9'
-        ];
-
-        $this->assertEquals($resultVersions, $this->comparator->filterVersionsByConstraint('^18.0.0', $versions));
-
-        $resultVersions = [
-            '19.1.0',
-            '19.0.0'
-        ];
-
-        $this->assertEquals($resultVersions, $this->comparator->filterVersionsByConstraint('^19.0.0', $versions));
-    }
-
-    public function testCanGetLatestVersionByConstraint()
-    {
-        $versions = [
-            '17.111.9',
-            '1.2.3',
-            '18.22.10',
-            '18.33.10',
-            '18.22.9',
-            '19.1.0',
-            '19.0.0',
-            '19.0.0-beta.1'
-        ];
-
-        $this->assertEquals('', $this->comparator->getLatestVersionByConstraint('^0.0.0', $versions));
-        $this->assertEquals('', $this->comparator->getLatestVersionByConstraint('^2.0.0', $versions));
-        $this->assertEquals('18.33.10', $this->comparator->getLatestVersionByConstraint('^18.0.0', $versions));
-        $this->assertEquals('19.1.0', $this->comparator->getLatestVersionByConstraint('^19.0.0', $versions));
-    }
-
-    public function testCanGetOldestVersionByConstraint()
-    {
-        $versions = [
-            '17.111.9',
-            '1.2.3',
-            '18.22.10',
-            '18.33.10',
-            '18.22.9',
-            '19.1.0',
-            '19.0.0',
-            '19.0.0-beta.1'
-        ];
-
-        $this->assertEquals('', $this->comparator->getOldestVersionByConstraint('^0.0.0', $versions));
-        $this->assertEquals('', $this->comparator->getOldestVersionByConstraint('^2.0.0', $versions));
-        $this->assertEquals('18.22.9', $this->comparator->getOldestVersionByConstraint('^18.0.0', $versions));
-        $this->assertEquals('19.0.0-beta.1', $this->comparator->getOldestVersionByConstraint('^19.0.0-beta', $versions));
-        $this->assertEquals('19.0.0', $this->comparator->getOldestVersionByConstraint('^19.0.0', $versions));
-    }
-
-    public function testCanFilterStableVersions()
-    {
-        $versions = [
-            '18.33.10',
-            '19.0.0-beta.1',
-            '18.22.9',
-            '19.1.0-alpha.1',
-            '19.0.0'
-        ];
-
-        $resultVersions = [
-            '18.33.10',
-            '18.22.9',
-            '19.0.0'
-        ];
-
-        $this->assertEquals($resultVersions, $this->comparator->filterStable($versions));
-    }
 }

From 2561b6806193cbe6a6a25dafd09694d55059e33a Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Wed, 22 Mar 2023 19:41:18 +0100
Subject: [PATCH 07/12] feat: add restore script

---
 src/Templates/restore.php.tmpl | 181 +++++++++++++++++++++++++++++++++
 1 file changed, 181 insertions(+)
 create mode 100644 src/Templates/restore.php.tmpl

diff --git a/src/Templates/restore.php.tmpl b/src/Templates/restore.php.tmpl
new file mode 100644
index 00000000..6bc65f4a
--- /dev/null
+++ b/src/Templates/restore.php.tmpl
@@ -0,0 +1,181 @@
+<?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 Restore
+{
+    private const ACTION_RESTORE = 'restore';
+
+    /** @var string */
+    private $mmlcRootPath;
+
+    /** @var string */
+    private $backupRootPath;
+
+    /** @var string[] */
+    private $checkFiles = [];
+
+    /** @var string[] */
+    private $restoreFiles = [];
+
+    public function __construct()
+    {
+        $this->mmlcRootPath = __DIR__;
+        $this->backupRootPath = __DIR__ . '/backup';
+
+        $this->restoreFiles = [
+            '/config',
+            '/scripts',
+            '/src',
+            '/vendor',
+            '/index.php'
+        ];
+
+        $this->checkFiles = [
+            '/config',
+            '/src',
+            '/vendor',
+            '/index.php'
+        ];
+    }
+
+    public function invoke(): void
+    {
+        $action = $_GET['action'] ?? '';
+
+        if ($action === self::ACTION_RESTORE) {
+            $this->invokeRestore();
+        } else {
+            $this->invokeIndex();
+        }
+    }
+
+    private function invokeIndex(): void
+    {
+        $restoreUrl = '?action=' . self::ACTION_RESTORE;
+
+        if ($this->isRestorePossilbe()) {
+            $this->outDie(
+                "Click on the following link to restore the MMLC. <a href=\"$restoreUrl\">Restore MMLC now</a>"
+            );
+        } elseif ($this->isRestored()) {
+            $this->outDie(
+                "Looks like your MMLC is restored. <a href=\"index.php\">Go to MMLC</a>"
+            );
+        } elseif (!$this->isRestored() && $this->isRestorePossilbe()) {
+            $filesString = implode("<br>\n", $this->getMissingBackupFiles());
+            $this->outDie(
+                "Restore is not possible. Can not find the following files:<br>\n"
+                . "<br>\n"
+                . "$filesString<br>\n"
+            );
+        } elseif (!$this->isRestored() && !$this->isRestorePossilbe()) {
+            $filesString = implode("<br>\n", $this->getMissingBackupFiles());
+            $this->outDie(
+                "Your MMLC is NOT restored but a Restore is not possible. Can not find the following files:<br>\n"
+                . "<br>\n"
+                . "$filesString<br>\n"
+            );
+        }
+
+        $this->outDie(
+            "You can try to restore the MMLC. <a href=\"$restoreUrl\">Restore MMLC now</a>"
+        );
+    }
+
+    private function invokeRestore(): void
+    {
+        $message = '';
+        foreach ($this->restoreFiles as $restoreFile) {
+            $fromFile = $this->backupRootPath . $restoreFile;
+            $toFile = $this->mmlcRootPath . $restoreFile;
+
+            rename($fromFile, $toFile);
+
+            if (!file_exists($this->mmlcRootPath . $restoreFile)) {
+                $message .= "Something went wrong. Can not copy $fromFile to $toFile<br>\n";
+            }
+        }
+
+        if ($message) {
+            $this->outDie($message);
+        }
+
+        header("Location: index.php");
+        die();
+    }
+
+    private function isRestored(): bool
+    {
+        if ($this->getMissungFiles()) {
+            return false;
+        }
+        return true;
+    }
+
+    private function isRestorePossilbe(): bool
+    {
+        if ($this->getMissingBackupFiles()) {
+            return false;
+        }
+        return true;
+    }
+
+    private function getMissingBackupFiles(): array
+    {
+        $missingPaths = [];
+        foreach ($this->checkFiles as $path) {
+            if (!file_exists($this->backupRootPath . $path)) {
+                $missingPaths[] = $this->backupRootPath . $path;
+            }
+        }
+
+        return $missingPaths;
+    }
+
+    private function getMissungFiles(): array
+    {
+        $missingPaths = [];
+        foreach ($this->checkFiles as $path) {
+            if (!file_exists($this->mmlcRootPath . $path)) {
+                $missingPaths[] = $this->backupRootPath . $path;
+            }
+        }
+
+        return $missingPaths;
+    }
+
+    private function render(string $html): string
+    {
+        $html = ""
+            . "<h1>MMLC Restore</h1>\n"
+            . "$html<br>\n";
+
+        $html = ''
+        . '<div style="max-width: 800px; margin: 50px auto; padding: 30px; border: 1px solid black">'
+            . $html
+        . '</div>';
+
+        return $html;
+    }
+
+    private function outDie(string $message): void
+    {
+        echo $this->render($message);
+        die();
+    }
+}
+
+$restore = new Restore();
+$restore->invoke();

From b002bf3c3c60fa993f8c2e4d33a8eb78a1077da1 Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Wed, 22 Mar 2023 19:42:16 +0100
Subject: [PATCH 08/12] feat: add methods nextMinor() and __toString to Version
 and add tests

---
 src/Classes/Semver/Version.php               | 19 ++++++++++
 tests/unit/SemverTests/SemverVersionTest.php | 38 ++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 tests/unit/SemverTests/SemverVersionTest.php

diff --git a/src/Classes/Semver/Version.php b/src/Classes/Semver/Version.php
index 392d754f..5b93d4eb 100644
--- a/src/Classes/Semver/Version.php
+++ b/src/Classes/Semver/Version.php
@@ -47,4 +47,23 @@ public function getTag(): string
     {
         return $this->tag;
     }
+
+    public function nextMinor(): Version
+    {
+        return new Version(
+            $this->major,
+            $this->minor + 1,
+            0,
+            ''
+        );
+    }
+
+    public function __toString()
+    {
+        $versionString = $this->major . '.' . $this->minor . '.' . $this->patch;
+        if ($this->tag) {
+            $versionString .= '-' . $this->tag;
+        }
+        return $versionString;
+    }
 }
diff --git a/tests/unit/SemverTests/SemverVersionTest.php b/tests/unit/SemverTests/SemverVersionTest.php
new file mode 100644
index 00000000..6e3062fe
--- /dev/null
+++ b/tests/unit/SemverTests/SemverVersionTest.php
@@ -0,0 +1,38 @@
+<?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\Tests\Unit\SemverTests;
+
+use PHPUnit\Framework\TestCase;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Version;
+
+class SemverVersionTest extends TestCase
+{
+    public function testCanConvertToArray()
+    {
+        $version = new Version(1, 2, 3, 'beta.1');
+        $this->assertEquals('1.2.3-beta.1', $version);
+
+        $version = new Version(10, 3, 5, '');
+        $this->assertEquals('10.3.5', $version);
+    }
+
+    public function testCanGetNextMinor()
+    {
+        $version = new Version(1, 2, 3, 'beta.1');
+        $this->assertEquals('1.2.3-beta.1', $version);
+
+        $nextMinorVersion = $version->nextMinor();
+        $this->assertEquals('1.3.0', $nextMinorVersion);
+    }
+}

From 4ef168253bf9f14adc620b2bc69832752908bc72 Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Wed, 22 Mar 2023 19:42:57 +0100
Subject: [PATCH 09/12] feat: add new classes MmlcVersionInfo and
 MmlcVersionInfoLoader and tests

---
 src/Classes/MmlcVersionInfo.php          |  23 +++
 src/Classes/MmlcVersionInfoLoader.php    | 170 +++++++++++++++++++++++
 tests/unit/MmlcVersionInfoLoaderTest.php | 154 ++++++++++++++++++++
 3 files changed, 347 insertions(+)
 create mode 100644 src/Classes/MmlcVersionInfo.php
 create mode 100644 src/Classes/MmlcVersionInfoLoader.php
 create mode 100644 tests/unit/MmlcVersionInfoLoaderTest.php

diff --git a/src/Classes/MmlcVersionInfo.php b/src/Classes/MmlcVersionInfo.php
new file mode 100644
index 00000000..575ae2c0
--- /dev/null
+++ b/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;
+}
diff --git a/src/Classes/MmlcVersionInfoLoader.php b/src/Classes/MmlcVersionInfoLoader.php
new file mode 100644
index 00000000..0a7ce597
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/tests/unit/MmlcVersionInfoLoaderTest.php b/tests/unit/MmlcVersionInfoLoaderTest.php
new file mode 100644
index 00000000..277a67bf
--- /dev/null
+++ b/tests/unit/MmlcVersionInfoLoaderTest.php
@@ -0,0 +1,154 @@
+<?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\Tests\Unit;
+
+use PHPUnit\Framework\TestCase;
+use RobinTheHood\ModifiedModuleLoaderClient\Api\V1\ApiRequest;
+use RobinTheHood\ModifiedModuleLoaderClient\MmlcVersionInfo;
+use RobinTheHood\ModifiedModuleLoaderClient\MmlcVersionInfoLoader;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Filter;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Parser;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Sorter;
+
+class MmlcVersionInfoLoaderTest extends TestCase
+{
+    public function testCanGetAll()
+    {
+        $mmlcVersionInfoLoader = $this->getMmlcVersionInfoLoader();
+
+        $mmlcVersionInfos = $mmlcVersionInfoLoader->getAll();
+
+        $this->assertContainsOnlyInstancesOf(MmlcVersionInfo::class, $mmlcVersionInfos);
+        $this->assertCount(13, $mmlcVersionInfos);
+        $this->assertEquals('1.1.1-alpha', $mmlcVersionInfos[0]->version);
+        $this->assertEquals('ModifiedModuleLoaderClient_v1.1.1-alpha.tar', $mmlcVersionInfos[0]->fileName);
+    }
+
+    public function testCanGetNewestStable()
+    {
+        $mmlcVersionInfoLoader = $this->getMmlcVersionInfoLoader();
+
+        $mmlcVersionInfo = $mmlcVersionInfoLoader->getNewest();
+        $this->assertEquals('2.1.0', $mmlcVersionInfo->version);
+    }
+
+    public function testCanGetNewestUnstable()
+    {
+        $mmlcVersionInfoLoader = $this->getMmlcVersionInfoLoader();
+
+        $mmlcVersionInfo = $mmlcVersionInfoLoader->getNewest(true);
+        $this->assertEquals('2.2.0-beta', $mmlcVersionInfo->version);
+    }
+
+    public function testCanGetNextNewestStable()
+    {
+        $mmlcVersionInfoLoader = $this->getMmlcVersionInfoLoader();
+
+        $mmlcVersionInfo = $mmlcVersionInfoLoader->getNextNewest('1.2.1');
+        $this->assertEquals('1.3.0', $mmlcVersionInfo->version);
+    }
+
+    public function testCanGetNextNewestUnstable()
+    {
+        $mmlcVersionInfoLoader = $this->getMmlcVersionInfoLoader();
+
+        $mmlcVersionInfo = $mmlcVersionInfoLoader->getNextNewest('1.2.1', true);
+        $this->assertEquals('1.3.0', $mmlcVersionInfo->version);
+
+        $mmlcVersionInfo = $mmlcVersionInfoLoader->getNextNewest('2.1.0', true);
+        $this->assertEquals('2.2.0-beta', $mmlcVersionInfo->version);
+    }
+
+    private function getMmlcVersionInfoLoader(): MmlcVersionInfoLoader
+    {
+        $parser = new Parser();
+        $comparator = new Comparator($parser);
+        $sorter = new Sorter($comparator);
+        $filter = new Filter($parser, $comparator, $sorter);
+
+        $mmlcVersionInfoLoader = new MmlcVersionInfoLoader(
+            $this->getMockedApiRequest(),
+            $parser,
+            $filter
+        );
+
+        return $mmlcVersionInfoLoader;
+    }
+
+    private function getMockedApiRequest(): ApiRequest
+    {
+        /** @var MockObject $mockedApiRequest */
+        $mockedApiRequest = $this->createMock(ApiRequest::class);
+        $mockedApiRequest->method('getAllVersions')->willReturn([
+            'content' => [
+                [
+                'version' => '1.1.1-alpha',
+                'fileName' => 'ModifiedModuleLoaderClient_v1.1.1-alpha.tar'
+                ],
+                [
+                    'version' => '1.1.2-alpha',
+                    'fileName' => 'ModifiedModuleLoaderClient_v1.1.2-alpha.tar'
+                ],
+                [
+                    'version' => '1.1.2',
+                    'fileName' => 'ModifiedModuleLoaderClient_v1.1.2.tar'
+                ],
+                [
+                    'version' => '1.1.3-alpha',
+                    'fileName' => 'ModifiedModuleLoaderClient_v1.1.3-alpha.tar'
+                ],
+                [
+                    'version' => '1.2.0',
+                    'fileName' => 'ModifiedModuleLoaderClient_v1.2.0.tar'
+                ],
+                [
+                    'version' => '1.2.1',
+                    'fileName' => 'ModifiedModuleLoaderClient_v1.2.1.tar'
+                ],
+                [
+                    'version' => '1.3.0-beta.1',
+                    'fileName' => 'ModifiedModuleLoaderClient_v1.3.0-beta.1.tar'
+                ],
+                [
+                    'version' => '1.3.0',
+                    'fileName' => 'ModifiedModuleLoaderClient_v1.3.0.tar'
+                ],
+                [
+                    'version' => '1.3.1',
+                    'fileName' => 'ModifiedModuleLoaderClient_v1.3.1.tar'
+                ],
+                [
+                    'version' => '2.0.0',
+                    'fileName' => 'ModifiedModuleLoaderClient_v2.0.0.tar'
+                ],
+                [
+                    'version' => '2.1.0',
+                    'fileName' => 'ModifiedModuleLoaderClient_v2.1.0.tar'
+                ],
+                [
+                    'version' => '2.1.1-beta',
+                    'fileName' => 'ModifiedModuleLoaderClient_v2.1.1-beta.tar'
+                ],
+                [
+                    'version' => '2.2.0-beta',
+                    'fileName' => 'ModifiedModuleLoaderClient_v2.2.0-beta.tar'
+                ]
+            ]
+        ]);
+
+        /** @var ApiRequest $mockedApiRequest */
+        return $mockedApiRequest;
+    }
+}

From a9d3f23b9099650d9b9609aeca0ac4cb971ba94d Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Wed, 22 Mar 2023 19:43:41 +0100
Subject: [PATCH 10/12] refactor: use App:getMmlcVersion instead of
 SelfUpdater::getInstalledVersion()

---
 src/Classes/SendMail.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Classes/SendMail.php b/src/Classes/SendMail.php
index 9115f89d..c7aba7f0 100644
--- a/src/Classes/SendMail.php
+++ b/src/Classes/SendMail.php
@@ -39,8 +39,7 @@ public static function sendIssue(): void
         $subject = 'MMLC Report Issue';
         $shopVersion = ShopInfo::getModifiedVersion();
 
-        $selfUpdater = new SelfUpdater();
-        $mmlcVersion = $selfUpdater->getInstalledVersion();
+        $mmlcVersion = App::getMmlcVersion();
 
         $message .=
             '<hr />Message sent from: ' . $_SERVER['HTTP_HOST'] .

From c258d98f33808471658618f77ec8e6c5d83a4675 Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Wed, 22 Mar 2023 19:44:13 +0100
Subject: [PATCH 11/12] style: improve coding style

---
 tests/unit/AppTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/AppTest.php b/tests/unit/AppTest.php
index ab272b97..fa5c96e4 100644
--- a/tests/unit/AppTest.php
+++ b/tests/unit/AppTest.php
@@ -18,7 +18,6 @@
 
 class AppTest extends TestCase
 {
-
     public function testRootDirectoryEndsWidthModifiedModuleLoaderClient()
     {
         $this->assertStringEndsWith('ModifiedModuleLoaderClient', App::getRoot());

From 06809d5c53a3220c19255c65bcc4341321483489 Mon Sep 17 00:00:00 2001
From: Robin Wieschendorf <mail@robinwieschendorf.de>
Date: Wed, 22 Mar 2023 19:46:05 +0100
Subject: [PATCH 12/12] feat: use new class MmlcVersionInfoLoader and improve
 error messages if self updater fails

---
 src/Classes/IndexController.php   |  41 ++--
 src/Classes/SelfUpdater.php       | 392 +++++++++++++++++-------------
 src/Templates/SelfUpdate.tmpl.php |   8 +-
 tests/unit/SelfUpdaterTest.php    | 207 ++++++++--------
 4 files changed, 353 insertions(+), 295 deletions(-)

diff --git a/src/Classes/IndexController.php b/src/Classes/IndexController.php
index eb95ebd2..0721258a 100644
--- a/src/Classes/IndexController.php
+++ b/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;
         }
diff --git a/src/Classes/SelfUpdater.php b/src/Classes/SelfUpdater.php
index 47910890..76dad5be 100644
--- a/src/Classes/SelfUpdater.php
+++ b/src/Classes/SelfUpdater.php
@@ -17,248 +17,199 @@
 use RobinTheHood\ModifiedModuleLoaderClient\Config;
 use RobinTheHood\ModifiedModuleLoaderClient\Semver\Parser;
 use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
-use RobinTheHood\ModifiedModuleLoaderClient\Semver\ParseErrorException;
 use RobinTheHood\ModifiedModuleLoaderClient\Helpers\FileHelper;
 use RobinTheHood\ModifiedModuleLoaderClient\Api\V1\HttpRequest;
-use RobinTheHood\ModifiedModuleLoaderClient\Api\V1\ApiRequest;
 use RobinTheHood\ModifiedModuleLoaderClient\Semver\Filter;
 use RobinTheHood\ModifiedModuleLoaderClient\Semver\Sorter;
-use RobinTheHood\ModifiedModuleLoaderClient\Semver\Version;
 
 class SelfUpdater
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     private $appRoot = '';
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $remoteUpdateServer;
 
-    /**
-     * @var Comparator
-     */
+    /** @var Comparator */
     protected $comparator;
 
-    /**
-     * @var Parser
-     */
+    /** @var Parser */
     protected $parser;
 
     /** @var Filter */
     protected $filter;
 
-    private $apiRequest;
+    /** @var MmlcVersionInfoLoader */
+    protected $mmlcVersionInfoLoader;
 
-    public function __construct($apiRequest = null)
+    /**
+     * Während der Installtion werden Dateien und damit auch die Pfade von Klassen verschoben.
+     * Wird eine Klasse geladen, nachdem die Datei verschoben wurde, kann der PHP Classloader die Klasse
+     * nicht finden und ein Fehler tritt auf. Aus diesem Grund müssen alle benötigten Daten und Klassen in den Speicher
+     * geladen werden, bevor die Dateien verschoben werden.
+     */
+    public function __construct(MmlcVersionInfoLoader $mmlcVersionInfoLoader)
     {
-        $this->apiRequest = $apiRequest;
-
-        // appRoot wird in die Variable ausgelagert, da während der Installation,
-        // wenn Dateien verschoben werden, die Methode App::getRoot() nicht
-        // mehr richtige Ergebnisse liefert.
         $this->appRoot = App::getRoot();
-
-        $remoteAddress = Config::getRemoteAddress() ?? '';
-
-        if (empty(Config::getRemoteAddress())) {
-            throw new \RuntimeException('Unable to connect. RemoteAddress is empty or not set.');
-        }
-
-        $this->remoteUpdateServer = str_replace('/api.php', '/Downloads/', $remoteAddress);
-
+        $this->mmlcVersionInfoLoader = $mmlcVersionInfoLoader;
+        $this->remoteUpdateServer = $this->getRomteUpdateServer();
         $this->comparator = new Comparator(new Parser());
         $this->parser = new Parser();
         $this->filter = new Filter($this->parser, $this->comparator, new Sorter($this->comparator));
     }
 
-
-    public function checkUpdate(): bool
+    /**
+     * Gibt true zurück wenn eine neue MMLC Version verfügbar ist.
+     */
+    public function updateAvailable(string $installedMmlcVersionString, bool $latest): bool
     {
-        $latest = Config::getSelfUpdate() == 'latest';
-        $newestVersionInfo = $this->getNewestVersionInfo($latest);
-        $installedVersion = $this->getInstalledVersion();
-
-        try {
-            if ($this->comparator->greaterThan($newestVersionInfo['version'], $installedVersion)) {
-                return true;
-            }
-        } catch (ParseErrorException $e) {
-            // do nothing
+        if ($this->getNextMmlcVersionInfo($installedMmlcVersionString, $latest)) {
+            return true;
         }
-
         return false;
     }
 
-    public function getVersionInfos(): array
-    {
-        if ($this->apiRequest) {
-            $apiRequest = $this->apiRequest;
-        } else {
-            $apiRequest = new ApiRequest();
-        }
-        $result = $apiRequest->getAllVersions();
-
-        $content = $result['content'] ?? [];
-        if (!$content) {
-            return [];
-        }
-
-        return $content;
-    }
-
-    public function getInstalledVersion(): string
-    {
-        $json = file_get_contents($this->appRoot . '/config/version.json');
-        $version = json_decode($json);
-        if ($version) {
-            return $version->version;
-        }
-        return ''; // Better throw an exception
-    }
-
     /**
-     * @return array<string, string> Returns the latest version info
+     * Gibt die nächst möglichste MmlcVersionInfo zurück, falls eine neue MMLC Version verfügbar ist.
      */
-    public function getNewestVersionInfo($latest = false): array
+    public function getNextMmlcVersionInfo(string $installedMmlcVersionString, bool $latest): ?MmlcVersionInfo
     {
-        $versionInfos = $this->getVersionInfos();
-
-        $newestVersionInfo = ['fileName' => '', 'version' => '0.0.0-alpha'];
-
-        foreach ($versionInfos as $versionInfo) {
-            try {
-                $version = $this->parser->parse($versionInfo['version']);
-
-                if (!$latest && $version->getTag()) {
-                    continue;
-                }
+        $mmlcVersionInfo = $this->mmlcVersionInfoLoader->getNextNewest($installedMmlcVersionString, $latest);
+        if (!$mmlcVersionInfo) {
+            return null;
+        }
 
-                if ($this->comparator->greaterThan($versionInfo['version'], $newestVersionInfo['version'])) {
-                    $newestVersionInfo = $versionInfo;
-                }
-            } catch (ParseErrorException $e) {
-                // do nothing
-            }
+        if (!$this->comparator->greaterThan($mmlcVersionInfo->version, $installedMmlcVersionString)) {
+            return null;
         }
 
-        return $newestVersionInfo;
+        return $mmlcVersionInfo;
     }
 
-    public function getNextNewestVersionInfo(bool $latest = false): array
+    public function update(MmlcVersionInfo $mmlcVersionInfo): void
     {
-        $versionInfos = $this->getVersionInfos();
-        $versionStrings = $this->getVersionStringsFromVersionInfos($versionInfos);
-
-        if (!$latest) {
-            $versionStrings = $this->filter->stable($versionStrings);
+        if (!$mmlcVersionInfo->fileName) {
+            return;
         }
 
-        $installtedVersionString = $this->getInstalledVersion();
-        $version = $this->parser->parse($installtedVersionString);
-
-        $constrain = '<=' . $version->getMajor() . '.' . ($version->getMinor() + 1) . '.0';
-
-        $versionString = $this->filter->latestByConstraint($constrain, $versionStrings);
-        $versionInfo = $this->getVersionInfoByVersionString($versionString, $versionInfos);
+        if (!$mmlcVersionInfo->version) {
+            return;
+        }
 
-        return $versionInfo;
-    }
+        $this->createRestore($mmlcVersionInfo);
+        $this->download($mmlcVersionInfo);
+        $this->backup($mmlcVersionInfo);
+        $this->untar($mmlcVersionInfo);
+        $this->verifyUntar($mmlcVersionInfo);
+        $this->install($mmlcVersionInfo);
+        $this->setupConfig($mmlcVersionInfo);
+        $this->setupVersion($mmlcVersionInfo);
+        $this->verifyUpdate($mmlcVersionInfo);
+        $this->removeRestore($mmlcVersionInfo);
 
-    private function getVersionInfoByVersionString($versionString, array $versionInfos): array
-    {
-        foreach ($versionInfos as $versionInfo) {
-            if ($versionInfo['version'] === $versionString) {
-                return $versionInfo;
-            }
-        }
-        return [];
+        opcache_reset();
     }
 
-    /**
-     * @return string[]
-     */
-    private function getVersionStringsFromVersionInfos(array $versionInfos): array
+    public function postUpdate(): bool
     {
-        $versionStrings = [];
-        foreach ($versionInfos as $versionInfo) {
-            $versionStrings[] = $versionInfo['version'];
+        if (file_exists($this->appRoot . '/config/postUpdate')) {
+            return false;
         }
-        return $versionStrings;
-    }
 
-    private function getFileNameByVersion(string $version): string
-    {
-        $versionInfos = $this->getVersionInfos();
-        foreach ($versionInfos as $versionInfo) {
-            if ($versionInfo['version'] == $version) {
-                return $versionInfo['fileName'];
-            }
-        }
-        return '';
-    }
+        $this->postUpdateSteps();
+        system('rm -rf ' . $this->appRoot . '/backup');
 
-    public function update(string $installVersion): void
-    {
-        $installFileName = $this->getFileNameByVersion($installVersion);
-        if (!$installFileName) {
-            return;
-        }
+        file_put_contents($this->appRoot . '/config/postUpdate', "SelfUpdate::postUpdate() DONE");
 
-        $this->download($installFileName);
-        $this->backup($installFileName);
-        $this->untar($installFileName);
-        $this->install();
-        $this->setupConfig();
-        opcache_reset();
+        return true;
     }
 
-    public function download(string $fileName): bool
+    private function download(MmlcVersionInfo $mmlcVersionInfo): bool
     {
-        $remoteAddress = $this->remoteUpdateServer . $fileName;
+        $remoteAddress = $this->remoteUpdateServer . $mmlcVersionInfo->fileName;
 
         $httpRequest = new HttpRequest();
         $tarBall = $httpRequest->sendGetRequest($remoteAddress);
 
         if (!$tarBall) {
-            die("Error: Can not download $remoteAddress file. <a href=\"?action=selfUpdate\">back</a>");
+            $this->showSoftError("Can not download file: $remoteAddress");
             return false;
         }
 
-        file_put_contents($this->appRoot . '/' . $fileName, $tarBall);
+        file_put_contents($this->appRoot . '/' . $mmlcVersionInfo->fileName, $tarBall);
+
         return true;
     }
 
-    public function backup(string $installFileName): void
+    private function backup(MmlcVersionInfo $mmlcVersionInfo): bool
     {
         $srcPath = $this->appRoot;
         $destPath = $this->appRoot . '/backup';
-        @mkdir($destPath);
+
+        if (!file_exists($destPath)) {
+            mkdir($destPath);
+        }
+
+        if (!file_exists($destPath)) {
+            $this->showSoftError("Can not create directory $destPath.");
+            return false;
+        }
 
         $exclude = [
             '/Archives',
             '/Modules',
             '/backup',
-            '/' . $installFileName
+            '/restore.php',
+            '/' . $mmlcVersionInfo->fileName
         ];
 
         $files = FileHelper::scanDir($srcPath, FileHelper::FILES_AND_DIRS, true);
         FileHelper::moveFilesTo($files, $srcPath, $destPath, $exclude);
+
+        return true;
+    }
+
+    private function createRestore(MmlcVersionInfo $mmlcVersionInfo): bool
+    {
+        $rootPath = $this->appRoot;
+
+        $restoreTemplateFilePath = $rootPath . '/src/Templates/restore.php.tmpl';
+        $restoreFilePath = $rootPath . '/restore.php';
+
+        if (!file_exists($restoreTemplateFilePath)) {
+            $this->showSoftError("Can not find file: $restoreTemplateFilePath");
+            return false;
+        }
+
+        copy($restoreTemplateFilePath, $restoreFilePath);
+
+        if (!file_exists($restoreFilePath)) {
+            $this->showSoftError("Can not create the automatic restore file at: $restoreFilePath");
+            return false;
+        }
+
+        return true;
+    }
+
+    private function removeRestore(MmlcVersionInfo $mmlcVersionInfo)
+    {
+        $rootPath = $this->appRoot;
+        $restoreFilePath = $rootPath . '/restore.php';
+
+        system('rm -rf ' . $restoreFilePath);
     }
 
-    public function untar(string $installFileName): void
+    private function untar(MmlcVersionInfo $mmlcVersionInfo): void
     {
-        $tarFilePath = $this->appRoot . '/' . $installFileName;
+        $tarFilePath = $this->appRoot . '/' . $mmlcVersionInfo->fileName;
 
-        $tarBall = new \PharData($installFileName);
+        $tarBall = new \PharData($mmlcVersionInfo->fileName);
         $tarBall->extractTo($this->appRoot, null, true);
 
         system('rm -rf ' . $tarFilePath);
     }
 
-    public function install(): void
+    private function install(MmlcVersionInfo $mmlcVersionInfo): void
     {
         $srcPath = $this->appRoot . '/ModifiedModuleLoaderClient';
         $destPath = $this->appRoot;
@@ -269,27 +220,72 @@ public function install(): void
         system('rm -rf ' . $srcPath);
     }
 
-    public function setupConfig(): void
+    private function setupConfig(MmlcVersionInfo $mmlcVersionInfo): void
     {
         @unlink($this->appRoot . '/config/config.php');
         @copy($this->appRoot . '/backup/config/config.php', $this->appRoot . '/config/config.php');
     }
 
+    private function setupVersion(MmlcVersionInfo $mmlcVersionInfo): void
+    {
+        $versionFilePath = $this->appRoot . '/config/version.json';
+        if (!file_exists($versionFilePath)) {
+            file_put_contents($this->appRoot . '/config/version.json', '{"version": "' . $mmlcVersionInfo->version . '"}');
+        }
+    }
 
-    public function checkAndDoPostUpdate(): bool
+    private function verifyUntar(MmlcVersionInfo $mmlcVersionInfo)
     {
-        if (file_exists($this->appRoot . '/config/postUpdate')) {
+        $checkPaths = [
+            $this->appRoot . '/ModifiedModuleLoaderClient/index.php',
+            $this->appRoot . '/ModifiedModuleLoaderClient/src',
+            $this->appRoot . '/ModifiedModuleLoaderClient/vendor',
+            $this->appRoot . '/ModifiedModuleLoaderClient/config'
+        ];
+
+        $missingPaths = [];
+        foreach ($checkPaths as $path) {
+            if (!file_exists($path)) {
+                $missingPaths[] = $path;
+            }
+        }
+
+        if ($missingPaths) {
+            $missingPathsString = implode("<br>\n", $missingPaths);
+            $this->showError("verify untar - can not find: <br>\n $missingPathsString");
             return false;
         }
 
-        $this->postUpdate();
-        system('rm -rf ' . $this->appRoot . '/backup');
+        return true;
+    }
+
+    private function verifyUpdate(MmlcVersionInfo $mmlcVersionInfo): bool
+    {
+        $checkPaths = [
+            $this->appRoot . '/index.php',
+            $this->appRoot . '/src',
+            $this->appRoot . '/vendor',
+            $this->appRoot . '/config',
+            $this->appRoot . '/config/config.php',
+        ];
+
+        $missingPaths = [];
+        foreach ($checkPaths as $path) {
+            if (!file_exists($path)) {
+                $missingPaths[] = $path;
+            }
+        }
+
+        if ($missingPaths) {
+            $missingPathsString = implode("<br>\n", $missingPaths);
+            $this->showError("Verify update - can not find: <br>\n $missingPathsString");
+            return false;
+        }
 
-        file_put_contents($this->appRoot . '/config/postUpdate', "SelfUpdate::postUpdate() DONE");
         return true;
     }
 
-    public function postUpdate(): void
+    private function postUpdateSteps(): void
     {
         // Vor der Version 1.12.0 haben sich die config.php und die version.json
         // im Root-Verzeichnis befunden und der alte SelfUpdater hat nicht alle
@@ -311,7 +307,7 @@ public function postUpdate(): void
         }
 
         // *** config/version.json ***
-        // Wenn die config/version.json Datei fehlt, gibt es 3 Möglichkeiten diese
+        // Wenn die config/version.json Datei fehlt, gibt es 2 Möglichkeiten diese
         // zu erzeugen.
         $dest = $this->appRoot . '/config/version.json';
 
@@ -322,11 +318,71 @@ public function postUpdate(): void
         if (!file_exists($dest) && file_exists($this->appRoot . '/version.json')) {
             rename($this->appRoot . 'version.json', $dest);
         }
+    }
 
-        if (!file_exists($dest)) {
-            $latest = Config::getSelfUpdate() == 'latest';
-            $newestVersionInfo = $this->getNewestVersionInfo($latest);
-            file_put_contents($this->appRoot . '/config/version.json', '{"version": "' . $newestVersionInfo['version'] . '"}');
+    private function getRomteUpdateServer(): string
+    {
+        $remoteAddress = Config::getRemoteAddress() ?? '';
+
+        if (empty(Config::getRemoteAddress())) {
+            throw new \RuntimeException('Unable to connect. RemoteAddress is empty or not set.');
         }
+
+        $remoteUpdateServer = str_replace('/api.php', '/Downloads/', $remoteAddress);
+        return $remoteUpdateServer;
+    }
+
+    private function showSoftError(string $message): void
+    {
+        $errorMessage = ""
+            . "<h1>ATTENTION: DO NOT RELOAD THIS PAGE</h1>\n"
+            . "Because this message will disappear and probably no longer be displayed after a reload "
+            . "or leads to further errors.<br>\n"
+            . "You can close the window if you don't want to read the message anymore."
+            . "<h2>The MMLC update was interrupted</h2>\n"
+            . "<h3>ERROR</h3>"
+            . "$message<br>\n"
+            . "<h3>WHAT CAN YOU DO</h3>\n"
+            . "You can go back with the following url: "
+            . "<a href=\"?action=selfUpdate\">Back to the MMLC System Page</a><br>\n";
+
+        $errorMessage = ''
+            . '<div style="max-width: 800px; margin: 50px auto; padding: 30px; border: 1px solid red">'
+                . $errorMessage
+            . '</div>';
+
+        die($errorMessage);
+    }
+
+    private function showError(string $message): void
+    {
+        $rootPath = $this->appRoot;
+        $backupPath = $this->appRoot . '/backup';
+
+        $errorMessage = ""
+            . "<h1>ATTENTION: DO NOT RELOAD THIS PAGE</h1>\n"
+            . "Because this message will disappear and probably no longer be displayed after a reload "
+            . "or leads to further errors.<br>\n"
+            . "You can close the window if you don't want to read the message anymore."
+            . "<h2>The MMLC update was interrupted</h2>\n"
+            . "Your MMLC is now in an unsave and unusable state.<br>\n"
+            . "<h3>ERROR</h3>"
+            . "$message<br>\n"
+            . "<h3>WHAT CAN YOU DO</h3>\n"
+            . "Variant a) Try the following restore link, it will open in a new window. "
+            . "<a href=\"restore.php\" target=\"?action=_blank\">To the MMLC restore script in a new window</a><br>\n"
+            . "<br>\n"
+            . "Variant b) Try to restore you MMLC by moving all files/directories from $backupPath to $rootPath<br>\n"
+            . "and delete directory $rootPath/ModifiedModuleLoaderClient if exists<br>\n"
+            . "<br>\n"
+            . "Variant c) Go to module-loader.de and load the installer to reinstall the MMLC. "
+            . "The installer will try to keep your settings and module data.<br>\n";
+
+        $errorMessage = ''
+            . '<div style="max-width: 800px; margin: 50px auto; padding: 30px; border: 1px solid red">'
+                . $errorMessage
+            . '</div>';
+
+        die($errorMessage);
     }
 }
diff --git a/src/Templates/SelfUpdate.tmpl.php b/src/Templates/SelfUpdate.tmpl.php
index 0f5b0264..206d3eb4 100644
--- a/src/Templates/SelfUpdate.tmpl.php
+++ b/src/Templates/SelfUpdate.tmpl.php
@@ -17,11 +17,11 @@
         <div class="content" style="text-align: center">
             <div class="self-update">
                 <h2>MMLC - Modified Module Loader Client</h2>
-                <?= $installedVersion ?><br><br>
+                <?= $installedVersionString ?><br><br>
 
-                <?php if ($comparator->greaterThan($version['version'], $installedVersion)) { ?>
-                    Version <?= $version['version'] ?> verfügbar<br><br>
-                    <a class="button button-success" href="?action=selfUpdate&install=<?= $version['version'] ?>">
+                <?php if ($mmlcVersionInfo) { ?>
+                    Version <?= $mmlcVersionInfo->version ?> verfügbar<br><br>
+                    <a class="button button-success" href="?action=selfUpdate&install=<?= $mmlcVersionInfo->version ?>">
                         Update installieren
                     </a>
                 <?php } else { ?>
diff --git a/tests/unit/SelfUpdaterTest.php b/tests/unit/SelfUpdaterTest.php
index 79f96108..ade13877 100644
--- a/tests/unit/SelfUpdaterTest.php
+++ b/tests/unit/SelfUpdaterTest.php
@@ -47,6 +47,11 @@ public function getStubedApiRequest()
         return $stubApiRequest;
     }
 
+    public function testNothing()
+    {
+        $this->assertTrue(true);
+    }
+
     public function getStubedSelfUpdater()
     {
         /** @var MockObject $stubSelfUpdater */
@@ -104,105 +109,105 @@ public function getStubedSelfUpdater()
         return $stubSelfUpdater;
     }
 
-    public function testGetInstalledVersion()
-    {
-        $selfUpdater = new SelfUpdater();
-        $version = $selfUpdater->getInstalledVersion();
-
-        $this->assertNotEmpty($version);
-        $this->assertIsString($version);
-    }
-
-    public function testGetNewestVersionInfo()
-    {
-        // Arrage
-        $stubApiRequest = $this->getStubedApiRequest();
-        $selfUpdater = new SelfUpdater($stubApiRequest);
-
-        // Act
-        $newestLatestVersionInfo = $selfUpdater->getNewestVersionInfo(true);
-        $newestStabelVersionInfo = $selfUpdater->getNewestVersionInfo(false);
-
-        // Assert
-        $expectsLatest = [
-            'version' => '1.1.3-alpha',
-            'fileName' => 'ModifiedModuleLoaderClient_v1.1.3-alpha.tar'
-        ];
-
-        $expectsStable = [
-            'version' => '1.1.2',
-            'fileName' => 'ModifiedModuleLoaderClient_v1.1.2.tar'
-        ];
-
-        $this->assertEquals($expectsLatest, $newestLatestVersionInfo);
-        $this->assertEquals($expectsStable, $newestStabelVersionInfo);
-    }
-
-    public function testGetVersionInfos()
-    {
-        // Arrage
-        $stubApiRequest = $this->getStubedApiRequest();
-        $selfUpdater = new SelfUpdater($stubApiRequest);
-
-        // Act
-        $versionInfos = $selfUpdater->getVersionInfos(true);
-
-        // Assert
-        $expects = [
-            [
-                'version' => '1.1.1-alpha',
-                'fileName' => 'ModifiedModuleLoaderClient_v1.1.1-alpha.tar'
-            ],
-            [
-                'version' => '1.1.2-alpha',
-                'fileName' => 'ModifiedModuleLoaderClient_v1.1.2-alpha.tar'
-            ],
-            [
-                'version' => '1.1.2',
-                'fileName' => 'ModifiedModuleLoaderClient_v1.1.2.tar'
-            ],
-            [
-                'version' => '1.1.3-alpha',
-                'fileName' => 'ModifiedModuleLoaderClient_v1.1.3-alpha.tar'
-            ],
-        ];
-
-        $this->assertEquals($expects, $versionInfos);
-    }
-
-    public function testCanGetNextNewestPathVersionInfo()
-    {
-        // 1.1.0 to 1.2.0
-        $selfUpdater = $this->getStubedSelfUpdater();
-        $selfUpdater->method('getInstalledVersion')->willReturn('1.1.0');
-        $this->assertEquals(
-            [
-                'version' => '1.2.0',
-                'fileName' => 'ModifiedModuleLoaderClient_v1.2.0.tar'
-            ],
-            $selfUpdater->getNextNewestVersionInfo()
-        );
-
-        // 1.2.0 to 1.3.0
-        $selfUpdater = $this->getStubedSelfUpdater();
-        $selfUpdater->method('getInstalledVersion')->willReturn('1.2.0');
-        $this->assertEquals(
-            [
-                'version' => '1.3.0',
-                'fileName' => 'ModifiedModuleLoaderClient_v1.3.0.tar'
-            ],
-            $selfUpdater->getNextNewestVersionInfo()
-        );
-
-        // 1.3.0 to 1.3.1
-        $selfUpdater = $this->getStubedSelfUpdater();
-        $selfUpdater->method('getInstalledVersion')->willReturn('1.3.0');
-        $this->assertEquals(
-            [
-                'version' => '1.3.1',
-                'fileName' => 'ModifiedModuleLoaderClient_v1.3.1.tar'
-            ],
-            $selfUpdater->getNextNewestVersionInfo()
-        );
-    }
+    // public function testGetInstalledVersion()
+    // {
+    //     $selfUpdater = new SelfUpdater();
+    //     $version = $selfUpdater->getInstalledVersion();
+
+    //     $this->assertNotEmpty($version);
+    //     $this->assertIsString($version);
+    // }
+
+    // public function testGetNewestVersionInfo()
+    // {
+    //     // Arrage
+    //     $stubApiRequest = $this->getStubedApiRequest();
+    //     $selfUpdater = new SelfUpdater($stubApiRequest);
+
+    //     // Act
+    //     $newestLatestVersionInfo = $selfUpdater->getNewestVersionInfo(true);
+    //     $newestStabelVersionInfo = $selfUpdater->getNewestVersionInfo(false);
+
+    //     // Assert
+    //     $expectsLatest = [
+    //         'version' => '1.1.3-alpha',
+    //         'fileName' => 'ModifiedModuleLoaderClient_v1.1.3-alpha.tar'
+    //     ];
+
+    //     $expectsStable = [
+    //         'version' => '1.1.2',
+    //         'fileName' => 'ModifiedModuleLoaderClient_v1.1.2.tar'
+    //     ];
+
+    //     $this->assertEquals($expectsLatest, $newestLatestVersionInfo);
+    //     $this->assertEquals($expectsStable, $newestStabelVersionInfo);
+    // }
+
+    // public function testGetVersionInfos()
+    // {
+    //     // Arrage
+    //     $stubApiRequest = $this->getStubedApiRequest();
+    //     $selfUpdater = new SelfUpdater($stubApiRequest);
+
+    //     // Act
+    //     $versionInfos = $selfUpdater->getVersionInfos(true);
+
+    //     // Assert
+    //     $expects = [
+    //         [
+    //             'version' => '1.1.1-alpha',
+    //             'fileName' => 'ModifiedModuleLoaderClient_v1.1.1-alpha.tar'
+    //         ],
+    //         [
+    //             'version' => '1.1.2-alpha',
+    //             'fileName' => 'ModifiedModuleLoaderClient_v1.1.2-alpha.tar'
+    //         ],
+    //         [
+    //             'version' => '1.1.2',
+    //             'fileName' => 'ModifiedModuleLoaderClient_v1.1.2.tar'
+    //         ],
+    //         [
+    //             'version' => '1.1.3-alpha',
+    //             'fileName' => 'ModifiedModuleLoaderClient_v1.1.3-alpha.tar'
+    //         ],
+    //     ];
+
+    //     $this->assertEquals($expects, $versionInfos);
+    // }
+
+    // public function testCanGetNextNewestPathVersionInfo()
+    // {
+    //     // 1.1.0 to 1.2.0
+    //     $selfUpdater = $this->getStubedSelfUpdater();
+    //     $selfUpdater->method('getInstalledVersion')->willReturn('1.1.0');
+    //     $this->assertEquals(
+    //         [
+    //             'version' => '1.2.0',
+    //             'fileName' => 'ModifiedModuleLoaderClient_v1.2.0.tar'
+    //         ],
+    //         $selfUpdater->getNextNewestVersionInfo()
+    //     );
+
+    //     // 1.2.0 to 1.3.0
+    //     $selfUpdater = $this->getStubedSelfUpdater();
+    //     $selfUpdater->method('getInstalledVersion')->willReturn('1.2.0');
+    //     $this->assertEquals(
+    //         [
+    //             'version' => '1.3.0',
+    //             'fileName' => 'ModifiedModuleLoaderClient_v1.3.0.tar'
+    //         ],
+    //         $selfUpdater->getNextNewestVersionInfo()
+    //     );
+
+    //     // 1.3.0 to 1.3.1
+    //     $selfUpdater = $this->getStubedSelfUpdater();
+    //     $selfUpdater->method('getInstalledVersion')->willReturn('1.3.0');
+    //     $this->assertEquals(
+    //         [
+    //             'version' => '1.3.1',
+    //             'fileName' => 'ModifiedModuleLoaderClient_v1.3.1.tar'
+    //         ],
+    //         $selfUpdater->getNextNewestVersionInfo()
+    //     );
+    // }
 }