[UPMERGE] 2.3 -> symfony-8 by SyliusBot · Pull Request #18945 · Sylius/Sylius
and others added 21 commits
January 19, 2026 15:29| Q | A |-----------------|----- | Branch? | 2.1 <!-- see the comment below --> | Bug fix? | yes | New feature? | no | Related tickets | fixes #18905 | License | MIT <!-- - Bug fixes must be submitted against the 1.14 or 2.1 branch - Features and deprecations must be submitted against the 2.2 branch - Make sure that the correct base branch is set To be sure you are not breaking any Backward Compatibilities, check the documentation: https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html --> ### What changed **Per-query SQL timeouts** - Telemetry has been improved with per-query database timeouts. If any query exceeds the limit, it is immediately interrupted and falls back gracefully with empty data. The global query timeout (in milliseconds, default: 60000, minimum: 1000) is configurable via environment variable: ``` SYLIUS_TELEMETRY_QUERY_TIMEOUT=30000 ``` **Improved TelemetryListener caching** - Telemetry collection is now rate-limited. Once triggered, it will be skipped for the next hour, preventing concurrent and redundant data collection on frequent admin page loads. **PostgreSQL compatibility** - Fixed boolean comparisons in telemetry providers (`enabled = 1` → `enabled = true`)
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/2.3/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/2.2 -m "Resolve conflicts between 2.1 and 2.2" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/Sylius` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
| Q | A |-----------------|----- | Branch? | 2.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Related tickets | #18566 | License | MIT <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Product queries now support locale fallback behavior, allowing items to display with default language content when specific language translations are unavailable. * Relaxed product filtering to include items even when exact locale translations don't exist. <sub>✏️ Tip: You can customize this high-level summary in your review settings.</sub> <!-- end of auto-generated comment: release notes by coderabbit.ai -->
| Q | A |-----------------|----- | Branch? | 2.2 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | fixes #X, partially #Y, mentioned in #Z | License | MIT In this PR i added and improved the translations in the admin bundle for german CH, german AT, and german DE.
… ScalarDataBag exception (#18933) | Q | A |-----------------|----- | Branch? | 2.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | fixes Sylius/Stack#354 | License | MIT ## Description When the `configuration.title` is not set in the hookable metadata, accessing it directly on a `ScalarDataBag` throws an exception. Adding `|default('')` prevents the crash.
| Q | A |-----------------|----- | Branch? | 2.1 <!-- see the comment below --> | Bug fix? | yes | New feature? | no | BC breaks? | no | License | MIT <!-- - Bug fixes must be submitted against the 1.14 or 2.1 branch - Features and deprecations must be submitted against the 2.2 branch - Make sure that the correct base branch is set To be sure you are not breaking any Backward Compatibilities, check the documentation: https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html --> related to #18887 changes
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/2.3/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/2.2 -m "Resolve conflicts between 2.1 and 2.2" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/Sylius` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/2.3/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/2.3 -m "Resolve conflicts between 2.2 and 2.3" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/Sylius` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added configurable database query timeouts for telemetry collection with environment variable support (default 60 seconds, minimum 1 second). * Implemented rate limiting for telemetry submissions to prevent excessive triggering (hourly cadence). * **Documentation** * Updated German translation strings for admin interface and UI labels. * **Chores** * Version bump to 2.2.5-dev. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters