Skip to content

Commit 76d5f5b

Browse files
mitelgmitelg
authored
Merge pull request #2823 from shopware5/chore/update-dependencies
chore: update dependencies
2 parents 76610f2 + 62f3353 commit 76d5f5b

File tree

2,957 files changed

+4515
-1686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,957 files changed

+4515
-1686
lines changed

‎.git-blame-ignore-revs

+3
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ e1d0b23fba81d3c80e80f2881ab38bf9d7f6397a
2323
# New license header
2424
3a73921085d70b87f9a71ff46c4c9035beec8ca0
2525
633e5ec44fabdbbbf73580a0ec857a4fb14030f9
26+
27+
# Update PHP-CS-Fixer
28+
cbbc9a6e6896903f7bd6d26730c05256f3d3563b

‎.github/workflows/check-php-code.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Setup PHP
4040
uses: shivammathur/setup-php@v2
4141
with:
42-
php-version: '8.1'
42+
php-version: '7.4'
4343

4444
- name: Cache CS-Fixer
4545
uses: actions/cache@v4

‎.phpstan-baseline.neon

-10
Original file line numberDiff line numberDiff line change
@@ -24920,11 +24920,6 @@ parameters:
2492024920
count: 1
2492124921
path: engine/Shopware/Core/sAdmin.php
2492224922

24923-
-
24924-
message: "#^Binary operation \"\\-\" between int\\|string and 1 results in an error\\.$#"
24925-
count: 1
24926-
path: engine/Shopware/Core/sArticles.php
24927-
2492824923
-
2492924924
message: "#^Cannot call method getId\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Media\\|null\\.$#"
2493024925
count: 1
@@ -34500,11 +34495,6 @@ parameters:
3450034495
count: 1
3450134496
path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
3450234497

34503-
-
34504-
message: "#^Parameter \\#1 \\$encodedValue of static method Zend_Json\\:\\:decode\\(\\) expects string, string\\|false given\\.$#"
34505-
count: 1
34506-
path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
34507-
3450834498
-
3450934499
message: "#^Parameter \\#1 \\$request of method ShopwarePlugins\\\\RestApi\\\\Components\\\\Router\\:\\:assembleRoute\\(\\) expects Enlight_Controller_Request_RequestHttp, Enlight_Controller_Request_Request\\|null given\\.$#"
3451034500
count: 1

‎UPGRADE-5.7.md

+8-7

‎_sql/migrations/101-add-extended-editor-field.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/102-add-new-emotions.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/103-add-field-blog-teaser.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/104-add-field-blog-thumbnail-size.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/105-s_core_sessions_backend.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/106-add-path-to-categories.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/107-remove-legacy-cache-config.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/108-add-category-listing-indexes.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/109-add-translations.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/110-add-disabled-cache-field.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/111-add-password-encoder.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/112-link-cache-menu-to-the-new-performance-module.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/113-adds-performance-sql.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/114-add-new-top-seller.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/115-add-denormalized-category-table.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/116-optimize-emotion-queries.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/117-add-article-detail-page-indexes.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/118-optimize-property-backend-queries.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/119-add-batchmode-option.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/120-add-cache-log.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1200-add-productbox-for-manufacturer.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1201-remove-secure-shop-config.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1202-remove-maxpages-formelement.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1203-remove-blog-indexpage-configuration.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1204-add-variant-filter.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1205-remove-canonical-http-setting.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1206-add-laststock-field-to-variants.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1207-add-new-seo-alias-for-variants.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1208-add-checkout-seo-routes.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1209-add-error-mail-log-level-config-option.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/121-fix-cache-label.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1210-fix-config-table-index.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1211-change-description-of-article-cover-setting.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1212-correct-typo-in-newsletter-backend-config.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1213-add-laststock-on-variant-template-generation.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1214-improve-email-header-field.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG
@@ -45,7 +46,7 @@ public function up($modus)
4546
AND form_id = @formId;
4647
SQL;
4748

48-
$sql = sprintf($sql, 's:' . \strlen(stripslashes($value)) . ':"' . $value . '";');
49+
$sql = \sprintf($sql, 's:' . \strlen(stripslashes($value)) . ':"' . $value . '";');
4950

5051
$this->addSql($sql);
5152
}

‎_sql/migrations/1215-form-active-status.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1216-remove-shopware-connect-menu.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1217-change-smtp-password-fieldtype.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG
@@ -31,7 +32,7 @@ public function up($modus)
3132
'autocomplete' => 'off',
3233
],
3334
]);
34-
$sql = sprintf(
35+
$sql = \sprintf(
3536
"UPDATE `s_core_config_elements` SET options = '%s' WHERE name = 'mailer_password' AND options IS NULL;",
3637
$inputType
3738
);

‎_sql/migrations/1218-change-privacy-options.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1219-add-cron-for-personal-data-cleanup.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/122-optimize-search-index-queries.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1221-add-double-opt-in-dates.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1222-privacy-checkbox-note.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1223-add-ip-anonymization.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1224-cleanup-optin-table.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1225-add-double-opt-in-register.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1226-add-blog-comment-mailtemplate.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1227-change-minimum-order-surcharge.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

‎_sql/migrations/1228-soptinregister-english-on-update.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Shopware 5
45
* Copyright (c) shopware AG

0 commit comments

Comments
 (0)