Skip to content

Commit 76d5f5b

Browse files
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 10 deletions
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

Lines changed: 8 additions & 7 deletions

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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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)