Skip to content

Commit 594fe4c

Browse files
authored
Merge pull request #240 from nextcloud/Rello-patch-1
fix enterprise channel check
2 parents 58a3097 + cfe978e commit 594fe4c

2 files changed

Lines changed: 25 additions & 6 deletions

File tree

src/Response.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,11 @@ private function getUpdateVersion() : array {
111111
return $beta;
112112
}
113113

114-
if (isset($enterprise) && $this->channel == 'enterprise' && (version_compare($this->version, $enterprise['version']) == -1 || $isMacOs)) {
115-
return $enterprise;
114+
if ($this->channel === 'enterprise' && isset($enterprise)) {
115+
if (version_compare($this->version, $enterprise['version']) === -1 || $isMacOs) {
116+
return $enterprise;
117+
}
118+
return []; // do not fall back to stable in case there is no enterprise update
116119
}
117120

118121
if (version_compare($this->version, $stable['version']) == -1 || $isMacOs) {

tests/unit/ResponseTest.php

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ public function updateDataProvider(): array
815815
<owncloudclient><version>2.2.2</version><versionstring>Nextcloud Client 2.2.2</versionstring><downloadurl>https://download.nextcloud.com/desktop/stable/Nextcloud-2.2.2-x64.AppImage</downloadurl><web>https://nextcloud.com/install/#install-clients</web></owncloudclient>
816816
'
817817
],
818-
// #38 Win11 -> QT6
818+
// #38 Win11 -> QT6 - enterprise. current version lower than enterprise => should update
819819
[
820820
'nextcloud',
821821
'win32',
@@ -831,7 +831,23 @@ public function updateDataProvider(): array
831831
<owncloudclient><version>2.2.2.6192</version><versionstring>Nextcloud Client 2.2.2 (build 6192)</versionstring><downloadurl>https://download.nextcloud.com/desktop/stable/ownCloud-2.2.2.6192-setup.exe</downloadurl></owncloudclient>
832832
'
833833
],
834-
// #39 macOS 11 (legacy) on enterprise channel — gets stable-qt6.9, not enterprise
834+
// #39 Win11 -> QT6 - enterprise. current version = current enterprise => emtpy
835+
[
836+
'nextcloud',
837+
'win32',
838+
'2.2.2.6192',
839+
'',
840+
"11",
841+
"10.0.26080",
842+
'stable',
843+
true,
844+
false,
845+
$config,
846+
'<?xml version="1.0"?>
847+
<owncloudclient/>
848+
'
849+
],
850+
// #40 macOS 11 (legacy) on enterprise channel — gets stable-qt6.9, not enterprise
835851
[
836852
'nextcloud',
837853
'macos',
@@ -858,7 +874,7 @@ public function updateDataProvider(): array
858874
</channel>
859875
</rss>'
860876
],
861-
// #40 macOS 14 — not legacy, gets regular stable via sparkle
877+
// #41 macOS 14 — not legacy, gets regular stable via sparkle
862878
[
863879
'nextcloud',
864880
'macos',
@@ -885,7 +901,7 @@ public function updateDataProvider(): array
885901
</channel>
886902
</rss>'
887903
],
888-
// #41 macOS 14 — not legacy, gets regular beta via sparkle
904+
// #42 macOS 14 — not legacy, gets regular beta via sparkle
889905
[
890906
'nextcloud',
891907
'macos',

0 commit comments

Comments
 (0)