address review and fix one test

Signed-off-by: szaimen <szaimen@e.mail.de>
nextcloud · Nov 14, 2022 · ddc200d · ddc200d
1 parent 163f362
commit ddc200d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/index.php b/index.php
@@ -51,7 +51,6 @@ public function accept(): bool {
 	}
 }
 
-use Composer\Semver\Semver;
 
 class Updater {
 	/** @var string */
@@ -167,9 +166,9 @@ public function checkForUpdate() {
 		$versionString = isset($response['versionstring']) ? $response['versionstring'] : '';
 
 		if ($version !== '' && $version !== $this->currentVersion) {
-			if (PHP_INT_SIZE < 8 && Semver::satisfies($version, '> 25')) {
+			if (PHP_INT_SIZE < 8 && version_compare($version, '26.0.0', '>=')) {
 				$this->updateAvailable = false;
-				$updateText = '<br />You are running a 32-bit PHP version. Cannot upgrade to Nextcloud 26 and higher. Please switch to 64-bit PHP.';
+				$updateText = '<br />You are running a 32-bit system. Nextcloud 26 supports 64-bit only, therefore an update cannot be offered. Please switch to a 64-bit system first.';
 				return $updateText;
 			}
 			$this->updateAvailable = true;

diff --git a/lib/Updater.php b/lib/Updater.php
@@ -23,8 +23,6 @@
 
 namespace NC\Updater;
 
-use Composer\Semver\Semver;
-
 class Updater {
 	/** @var string */
 	private $baseDir;
@@ -139,9 +137,9 @@ public function checkForUpdate() {
 		$versionString = isset($response['versionstring']) ? $response['versionstring'] : '';
 
 		if ($version !== '' && $version !== $this->currentVersion) {
-			if (PHP_INT_SIZE < 8 && Semver::satisfies($version, '> 25')) {
+			if (PHP_INT_SIZE < 8 && version_compare($version, '26.0.0', '>=')) {
 				$this->updateAvailable = false;
-				$updateText = '<br />You are running a 32-bit PHP version. Cannot upgrade to Nextcloud 26 and higher. Please switch to 64-bit PHP.';
+				$updateText = '<br />You are running a 32-bit system. Nextcloud 26 supports 64-bit only, therefore an update cannot be offered. Please switch to a 64-bit system first.';
 				return $updateText;
 			}
 			$this->updateAvailable = true;