shopware5 · mitelg · Jan 11, 2025 · Jan 10, 2025 · Nov 25, 2024 · Jan 10, 2025
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -23,3 +23,6 @@ e1d0b23fba81d3c80e80f2881ab38bf9d7f6397a
 # New license header
 3a73921085d70b87f9a71ff46c4c9035beec8ca0
 633e5ec44fabdbbbf73580a0ec857a4fb14030f9
+
+# Update PHP-CS-Fixer
+cbbc9a6e6896903f7bd6d26730c05256f3d3563b
diff --git a/.github/workflows/check-php-code.yml b/.github/workflows/check-php-code.yml
@@ -39,7 +39,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '7.4'
 
             -   name: Cache CS-Fixer
                 uses: actions/cache@v4

diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon
@@ -24920,11 +24920,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Core/sAdmin.php
 
-		-
-			message: "#^Binary operation \"\\-\" between int\\|string and 1 results in an error\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
 		-
 			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Media\\|null\\.$#"
 			count: 1
@@ -34500,11 +34495,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
 
-		-
-			message: "#^Parameter \\#1 \\$encodedValue of static method Zend_Json\\:\\:decode\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
-
 		-
 			message: "#^Parameter \\#1 \\$request of method ShopwarePlugins\\\\RestApi\\\\Components\\\\Router\\:\\:assembleRoute\\(\\) expects Enlight_Controller_Request_RequestHttp, Enlight_Controller_Request_Request\\|null given\\.$#"
 			count: 1

diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md
@@ -17,33 +17,34 @@ This changelog references changes done in Shopware 5.7 patch versions.
 * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead
 * Changed the `plugin.xsd` complexType `pluginType` so it could be validated again with newer `libxml2` versions
 
+* Updated `beberlei/assert` to version 3.3.3
 * Updated `beberlei/doctrineextensions` to version 1.4.0
 * Updated `cocur/slugify` to version 4.6.0 for PHP 8.0 and newer
 * Updated `doctrine/annotations` to version 1.14.4
-* Updated `doctrine/common` to version 3.4.5
+* Updated `doctrine/common` to version 3.5.0
 * Updated `doctrine/inflector` to version 2.0.10
 * Updated `doctrine/orm` to version 2.15.5
-* Updated `doctrine/persistence` to version 3.3.3
+* Updated `doctrine/persistence` to version 3.4.0
 * Updated `friendsofphp/proxy-manager-lts` to version 1.0.18
 * Updated `google/cloud-storage` to version 1.39.0
 * Updated `guzzlehttp/guzzle` to version 7.9.2
 * Updated `guzzlehttp/psr7` to version 2.7.0
-* Updated `monolog/monolog` to version 2.9.3
+* Updated `monolog/monolog` to version 2.10.0
 * Updated `mpdf/mpdf` to version 8.2.4
-* Updated `laminas/laminas-code` to version 4.15.1 for PHP 8.1 and newer
+* Updated `laminas/laminas-code` to version 4.16.0 for PHP 8.1 and newer
 * Updated `laminas/laminas-escaper` to version 2.15.0 for PHP 8.1 and newer
 * Updated `phpunit/phpunit` to version 9.6.21
 * Updated `setasign/fpdf` to version 1.8.6
-* Updated `setasign/fpdi` to version 2.6.1
+* Updated `setasign/fpdi` to version 2.6.2
 * Updated `symfony/polyfill-php80` to version 1.31.0
 * Updated `symfony/polyfill-php81` to version 1.31.0
 * Updated `symfony/polyfill-php82` to version 1.31.0
 * Updated `symfony/polyfill-php83` to version 1.31.0
-* Updated `symfony/process` to version 5.4.46
+* Updated `symfony/process` to version 5.4.47
 * Updated `symfony/http-kernel` to version 4.4.51
 * Updated `symfony/serializer` to version 5.4.45
 * Updated `voku/anti-xss` to version 4.1.42
-* Updated `wikimedia/less.php` to version 5.1.1
+* Updated `wikimedia/less.php` to version 5.1.2
 * Updated several indirect dependencies
 * Updated npm dependencies in `themes/package.json`
 * Updated npm dependencies in `themes/Frontend/Responsive/package.json`

diff --git a/_sql/migrations/101-add-extended-editor-field.php b/_sql/migrations/101-add-extended-editor-field.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/102-add-new-emotions.php b/_sql/migrations/102-add-new-emotions.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/103-add-field-blog-teaser.php b/_sql/migrations/103-add-field-blog-teaser.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/104-add-field-blog-thumbnail-size.php b/_sql/migrations/104-add-field-blog-thumbnail-size.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/105-s_core_sessions_backend.php b/_sql/migrations/105-s_core_sessions_backend.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/106-add-path-to-categories.php b/_sql/migrations/106-add-path-to-categories.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/107-remove-legacy-cache-config.php b/_sql/migrations/107-remove-legacy-cache-config.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/108-add-category-listing-indexes.php b/_sql/migrations/108-add-category-listing-indexes.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/109-add-translations.php b/_sql/migrations/109-add-translations.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/110-add-disabled-cache-field.php b/_sql/migrations/110-add-disabled-cache-field.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/111-add-password-encoder.php b/_sql/migrations/111-add-password-encoder.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/112-link-cache-menu-to-the-new-performance-module.php b/_sql/migrations/112-link-cache-menu-to-the-new-performance-module.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/113-adds-performance-sql.php b/_sql/migrations/113-adds-performance-sql.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/114-add-new-top-seller.php b/_sql/migrations/114-add-new-top-seller.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/115-add-denormalized-category-table.php b/_sql/migrations/115-add-denormalized-category-table.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/116-optimize-emotion-queries.php b/_sql/migrations/116-optimize-emotion-queries.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/117-add-article-detail-page-indexes.php b/_sql/migrations/117-add-article-detail-page-indexes.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/118-optimize-property-backend-queries.php b/_sql/migrations/118-optimize-property-backend-queries.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/119-add-batchmode-option.php b/_sql/migrations/119-add-batchmode-option.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/120-add-cache-log.php b/_sql/migrations/120-add-cache-log.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1200-add-productbox-for-manufacturer.php b/_sql/migrations/1200-add-productbox-for-manufacturer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1201-remove-secure-shop-config.php b/_sql/migrations/1201-remove-secure-shop-config.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1202-remove-maxpages-formelement.php b/_sql/migrations/1202-remove-maxpages-formelement.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1203-remove-blog-indexpage-configuration.php b/_sql/migrations/1203-remove-blog-indexpage-configuration.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1204-add-variant-filter.php b/_sql/migrations/1204-add-variant-filter.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1205-remove-canonical-http-setting.php b/_sql/migrations/1205-remove-canonical-http-setting.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1206-add-laststock-field-to-variants.php b/_sql/migrations/1206-add-laststock-field-to-variants.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1207-add-new-seo-alias-for-variants.php b/_sql/migrations/1207-add-new-seo-alias-for-variants.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1208-add-checkout-seo-routes.php b/_sql/migrations/1208-add-checkout-seo-routes.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1209-add-error-mail-log-level-config-option.php b/_sql/migrations/1209-add-error-mail-log-level-config-option.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/121-fix-cache-label.php b/_sql/migrations/121-fix-cache-label.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1210-fix-config-table-index.php b/_sql/migrations/1210-fix-config-table-index.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1211-change-description-of-article-cover-setting.php b/_sql/migrations/1211-change-description-of-article-cover-setting.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1212-correct-typo-in-newsletter-backend-config.php b/_sql/migrations/1212-correct-typo-in-newsletter-backend-config.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1213-add-laststock-on-variant-template-generation.php b/_sql/migrations/1213-add-laststock-on-variant-template-generation.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1214-improve-email-header-field.php b/_sql/migrations/1214-improve-email-header-field.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
@@ -45,7 +46,7 @@ public function up($modus)
 AND form_id = @formId;
 SQL;
 
-        $sql = sprintf($sql, 's:' . \strlen(stripslashes($value)) . ':"' . $value . '";');
+        $sql = \sprintf($sql, 's:' . \strlen(stripslashes($value)) . ':"' . $value . '";');
 
         $this->addSql($sql);
     }

diff --git a/_sql/migrations/1215-form-active-status.php b/_sql/migrations/1215-form-active-status.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1216-remove-shopware-connect-menu.php b/_sql/migrations/1216-remove-shopware-connect-menu.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1217-change-smtp-password-fieldtype.php b/_sql/migrations/1217-change-smtp-password-fieldtype.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
@@ -31,7 +32,7 @@ public function up($modus)
                 'autocomplete' => 'off',
             ],
         ]);
-        $sql = sprintf(
+        $sql = \sprintf(
             "UPDATE `s_core_config_elements` SET options = '%s' WHERE name = 'mailer_password' AND options IS NULL;",
             $inputType
         );

diff --git a/_sql/migrations/1218-change-privacy-options.php b/_sql/migrations/1218-change-privacy-options.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1219-add-cron-for-personal-data-cleanup.php b/_sql/migrations/1219-add-cron-for-personal-data-cleanup.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/122-optimize-search-index-queries.php b/_sql/migrations/122-optimize-search-index-queries.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1221-add-double-opt-in-dates.php b/_sql/migrations/1221-add-double-opt-in-dates.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1222-privacy-checkbox-note.php b/_sql/migrations/1222-privacy-checkbox-note.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1223-add-ip-anonymization.php b/_sql/migrations/1223-add-ip-anonymization.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1224-cleanup-optin-table.php b/_sql/migrations/1224-cleanup-optin-table.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1225-add-double-opt-in-register.php b/_sql/migrations/1225-add-double-opt-in-register.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1226-add-blog-comment-mailtemplate.php b/_sql/migrations/1226-add-blog-comment-mailtemplate.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1227-change-minimum-order-surcharge.php b/_sql/migrations/1227-change-minimum-order-surcharge.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG

diff --git a/_sql/migrations/1228-soptinregister-english-on-update.php b/_sql/migrations/1228-soptinregister-english-on-update.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG