Skip to content

Commit 2c517c0

Browse files
committed
Merge branch '5.1' into 2026.x
2 parents b4afa55 + 8911f81 commit 2c517c0

30 files changed

Lines changed: 308 additions & 191 deletions

File tree

.github/dependabot.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,44 @@ updates:
66
interval: "weekly"
77
open-pull-requests-limit: 10
88
groups:
9+
symfony:
10+
patterns:
11+
- "symfony/*"
12+
update-types:
13+
- "minor"
14+
- "patch"
15+
doctrine:
16+
patterns:
17+
- "doctrine/*"
18+
update-types:
19+
- "minor"
20+
- "patch"
921
composer:
1022
patterns:
1123
- "*"
24+
exclude-patterns:
25+
- "symfony/*"
26+
- "doctrine/*"
27+
update-types:
28+
- "minor"
29+
- "patch"
30+
ignore:
31+
# Symfony major bumps must be coordinated across all symfony/* packages
32+
# and aligned with pimcore's symfony constraint.
33+
- dependency-name: "symfony/*"
34+
update-types: ["version-update:semver-major"]
35+
# Doctrine ORM/DBAL/Fixtures majors require coordinated upgrades.
36+
- dependency-name: "doctrine/*"
37+
update-types: ["version-update:semver-major"]
38+
# Known BC-breaking majors — upgrade manually.
39+
- dependency-name: "webmozart/assert"
40+
update-types: ["version-update:semver-major"]
41+
- dependency-name: "symplify/easy-coding-standard"
42+
update-types: ["version-update:semver-major"]
43+
- dependency-name: "phpstan/phpstan"
44+
update-types: ["version-update:semver-major"]
45+
- dependency-name: "vimeo/psalm"
46+
update-types: ["version-update:semver-major"]
1247

1348
- package-ecosystem: "github-actions"
1449
directory: "/"

CHANGELOG-4.1.x.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 4.1.11
2+
* Fix order token generator entropy using CSPRNG and 32-char tokens by @Copilot in https://github.com/coreshop/CoreShop/pull/2964
3+
* Fix password reset security: user enumeration, weak tokens, plaintext storage, missing TTL by @Copilot in https://github.com/coreshop/CoreShop/pull/2961
4+
* backport passwordResetHashCreatedAt user migration from 2026.x by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/3008
5+
* [IndexBundle] OpenSearchWorker: Refactor delete methods for index operations by @aarongerig in https://github.com/coreshop/CoreShop/pull/3028
6+
17
## 4.1.10
28
* Fix outdated Menu Bundle docs for ExtJs event handling by @Copilot in https://github.com/coreshop/CoreShop/pull/2966
39
* Add multi-select drag & drop support for objectMultihref condition lists by @Copilot in https://github.com/coreshop/CoreShop/pull/2960

CHANGELOG-5.0.x.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 5.0.1
2+
* All changes merged from 4.1.*
3+
* Dependency Updates in FrontendBundle Design v2
4+
15
## 5.0.0
26

37
> CoreShop is now Licensed under CCL only! If you update to Version 5 make sure to read

0 commit comments

Comments
 (0)