Merge pull request #2613 from shopware5/5.7.19

5.7.19
shopware5 · Sep 25, 2023 · 37c41a6 · 37c41a6
2 parents 19af441 + 3e0dd89
commit 37c41a6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,7 +2,7 @@
 **.yaml export-ignore
 **.md export-ignore
 **.gitkeep export-ignore
-config.php export-ignore
+/config.php export-ignore
 .gitlab-ci.yml export-ignore
 .github/ export-ignore
 .gitignore export-ignore
@@ -22,3 +22,4 @@ snippets/backend/plugins/ export-ignore
 Makefile export-ignore
 .make* export-ignore
 vendor-bin/ export-ignore
+.danger.php export-ignore
diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md
@@ -2,9 +2,9 @@
 
 This changelog references changes done in Shopware 5.7 patch versions.
 
-## 5.7.19
+## 5.7.20
 
-[View all changes from v5.7.18...v5.7.19](https://github.com/shopware5/shopware/compare/v5.7.18...v5.7.19)
+[View all changes from v5.7.19...v5.7.20](https://github.com/shopware5/shopware/compare/v5.7.19...v5.7.20)
 
 ### Changes
 
@@ -31,6 +31,11 @@ This changelog references changes done in Shopware 5.7 patch versions.
 * Updated npm dependencies in `themes/package.json`
 * Updated npm dependencies in `themes/Frontend/Responsive/package.json`
 
+
+## 5.7.19
+
+[View all changes from v5.7.18...v5.7.19](https://github.com/shopware5/shopware/compare/v5.7.18...v5.7.19)
+
 ## 5.7.18
 
 [View all changes from v5.7.17...v5.7.18](https://github.com/shopware5/shopware/compare/v5.7.17...v5.7.18)

diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
@@ -168,12 +168,8 @@ public function downloadFile($sourceUri, $destinationUri, $totalSize, $hash)
         $error = curl_error($ch);
         curl_close($ch);
 
-        if ($isError && !$isHalted) {
-            throw new Exception('Wrong http code');
-        }
-
-        if ($result === false && !$isHalted) {
-            throw new Exception($error);
+        if (($result === false || $isError) && !$isHalted) {
+            throw new Exception($error ?: 'Unknown error');
         }
 
         clearstatcache(false, $partFile->getPathname());

diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php
@@ -133,7 +133,7 @@ private function createVersionFromGithubResponse(string $shopwareVersion, array
     private function getRelease(string $shopwareVersion, array $releaseInformation): array
     {
         foreach ($releaseInformation as $release) {
-            if (version_compare($shopwareVersion, $release['tag_name'], '>=')) {
+            if (version_compare($shopwareVersion, ltrim($release['tag_name'], 'v'), '>=')) {
                 continue;
             }
 

diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini
@@ -79,7 +79,7 @@ security_update_window/text = "<h2>Warning!</h2>A new security update is availab
 security_update_window/cancel = "Close"
 security_update_window/update = "Open software update"
 ftp/invalid_permissions = "Invalid file permissions"
-release_information = "You can access the release information of [1] here."
+release_information = "You can see the current release information for [1] here."
 
 [de_DE]
 cancel = "Abbrechen"
@@ -162,4 +162,4 @@ security_update_window/text = "<h2>Achtung!</h2>Ein neues Sicherheitsupdate ist
 security_update_window/cancel = "Schließen"
 security_update_window/update = "Softwareaktualisierung öffnen"
 ftp/invalid_permissions = "Invalide Datei Rechte"
-release_information = "Du kannst die aktuellen release Information von [1] hier beziehen."
+release_information = "Du kannst die aktuellen Release-Informationen zu [1] hier einsehen."
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js
@@ -179,7 +179,7 @@ Ext.define('Shopware.apps.SwagUpdate.view.Window', {
         var me = this;
 
         var text = Ext.String.format(
-            '<div class="swag-update-changelog"><a href="[0]">{s name="release_information"}You can access the release information of [1] here.{/s}</a></div>',
+            '<div class="swag-update-changelog"><br><a href="[0]">{s name="release_information"}{/s}</a></div>',
             me.changelog.get('changelog'),
             me.changelog.get('version')
         );