Ensure LatestStable release channel uses the version provided from API (

#22603) * Ensure LatestStable release channel uses the version provided from API * Adjust test and link in UI * always download latest stable if no version provided
matomo-org · Sep 20, 2024 · 15bbb30 · 15bbb30
1 parent f9d5c28
commit 15bbb30
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 30 deletions.
diff --git a/plugins/CoreHome/vue/dist/CoreHome.umd.js b/plugins/CoreHome/vue/dist/CoreHome.umd.js
diff --git a/plugins/CoreHome/vue/dist/CoreHome.umd.min.js b/plugins/CoreHome/vue/dist/CoreHome.umd.min.js
diff --git a/plugins/CoreHome/vue/src/VersionInfoHeaderMessage/VersionInfoHeaderMessage.vue b/plugins/CoreHome/vue/src/VersionInfoHeaderMessage/VersionInfoHeaderMessage.vue
@@ -95,7 +95,7 @@ export default defineComponent({
       let text = '';
 
       if (this.isMultiServerEnvironment) {
-        const link = externalRawLink(`https://builds.matomo.org/piwik-${this.latestVersionAvailable}.zip`);
+        const link = externalRawLink(`https://builds.matomo.org/matomo-${this.latestVersionAvailable}.zip`);
         text = translate(
           'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment',
           `<a rel="noreferrer noopener" href="${link}">builds.matomo.org</a>`,

diff --git a/plugins/CoreUpdater/ReleaseChannel.php b/plugins/CoreUpdater/ReleaseChannel.php
@@ -41,6 +41,10 @@ public function getUrlToCheckForLatestAvailableVersion()
 
     public function getDownloadUrlWithoutScheme($version)
     {
-        return sprintf('://builds.matomo.org/piwik-%s.zip', $version);
+        if (!empty($version)) {
+            return sprintf('://builds.matomo.org/matomo-%s.zip', $version);
+        }
+
+        return '://builds.matomo.org/matomo.zip';
     }
 }
diff --git a/plugins/CoreUpdater/ReleaseChannel/LatestStable.php b/plugins/CoreUpdater/ReleaseChannel/LatestStable.php
@@ -29,11 +29,6 @@ public function getDescription()
         return Piwik::translate('General_Recommended');
     }
 
-    public function getDownloadUrlWithoutScheme($version)
-    {
-        return '://builds.matomo.org/matomo.zip';
-    }
-
     public function getOrder()
     {
         return 10;

diff --git a/plugins/CoreUpdater/tests/Integration/ReleaseChannelTest.php b/plugins/CoreUpdater/tests/Integration/ReleaseChannelTest.php
@@ -49,7 +49,7 @@ public function setUp(): void
 
     public function testGetDownloadUrlWithoutSchemeShouldReturnUrlWithVersionNumberButWithoutScheme()
     {
-        $this->assertSame('://builds.matomo.org/piwik-2.15.0-b5.zip', $this->channel->getDownloadUrlWithoutScheme('2.15.0-b5'));
+        $this->assertSame('://builds.matomo.org/matomo-2.15.0-b5.zip', $this->channel->getDownloadUrlWithoutScheme('2.15.0-b5'));
     }
 
     public function testGetUrlToCheckForLatestAvailableVersion()