[UPMERGE] 5.1 -> 2026.x#3041
Merged
Merged
Conversation
Bumps [svgo](https://github.com/svg/svgo) from 3.3.2 to 3.3.3. - [Release notes](https://github.com/svg/svgo/releases) - [Commits](svg/svgo@v3.3.2...v3.3.3) --- updated-dependencies: - dependency-name: svgo dependency-version: 3.3.3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.3.1 to 1.4.0. - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](digitalbazaar/forge@v1.3.1...v1.4.0) --- updated-dependencies: - dependency-name: node-forge dependency-version: 1.4.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…-plugin Bumps [serialize-javascript](https://github.com/yahoo/serialize-javascript) to 7.0.5 and updates ancestor dependencies [serialize-javascript](https://github.com/yahoo/serialize-javascript), [@symfony/webpack-encore](https://github.com/symfony/webpack-encore) and [terser-webpack-plugin](https://github.com/webpack/terser-webpack-plugin). These dependencies need to be updated together. Updates `serialize-javascript` from 6.0.2 to 7.0.5 - [Release notes](https://github.com/yahoo/serialize-javascript/releases) - [Commits](yahoo/serialize-javascript@v6.0.2...v7.0.5) Updates `@symfony/webpack-encore` from 4.7.0 to 6.0.0 - [Release notes](https://github.com/symfony/webpack-encore/releases) - [Changelog](https://github.com/symfony/webpack-encore/blob/main/CHANGELOG.md) - [Commits](symfony/webpack-encore@v4.7.0...v6.0.0) Updates `terser-webpack-plugin` from 5.3.16 to 5.4.0 - [Release notes](https://github.com/webpack/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack/terser-webpack-plugin/blob/main/CHANGELOG.md) - [Commits](webpack/minimizer-webpack-plugin@v5.3.16...v5.4.0) --- updated-dependencies: - dependency-name: serialize-javascript dependency-version: 7.0.5 dependency-type: indirect - dependency-name: "@symfony/webpack-encore" dependency-version: 6.0.0 dependency-type: direct:development - dependency-name: terser-webpack-plugin dependency-version: 5.4.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
[IndexBundle] OpenSearchWorker: Refactor delete methods for index operations
[UPMERGE] 4.1 -> 5.0
…reShop/Bundle/FrontendBundle/Resources/assets/node-forge-1.4.0 Bump node-forge from 1.3.1 to 1.4.0 in /src/CoreShop/Bundle/FrontendBundle/Resources/assets
…reShop/Bundle/FrontendBundle/Resources/assets/svgo-3.3.3 Bump svgo from 3.3.2 to 3.3.3 in /src/CoreShop/Bundle/FrontendBundle/Resources/assets
Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
…reShop/Bundle/FrontendBundle/Resources/assets/multi-fe0135fba0 Bump serialize-javascript, @symfony/webpack-encore and terser-webpack-plugin in /src/CoreShop/Bundle/FrontendBundle/Resources/assets
[UPMERGE] 5.0 -> 5.1
fix psalm issue
… type registration Fix "No form type registered for block prefix ..." for the studio-form schema endpoint by registering all rule-engine FormTypes as proper `form.type` services via per-bundle globs with autoconfigure. This makes RegisterStudioFormTypesPass alone sufficient and makes RegisterFormTypesFromTagsPass redundant — removed it together with all its call sites in Order/Shipping/Payment/Product/Core bundles. Notification rule state/transition conditions used to render plain TextType fields because the ExtJS-era logic that filled selects from Symfony workflows was lost during the studio v2 migration. Reintroduce it on the backend: - AbstractWorkflowPlaceConfigurationType: ChoiceType populated from WorkflowInterface::getDefinition()->getPlaces() - AbstractStateTransitionConfigurationType: ChoiceType populated from WorkflowInterface::getDefinition()->getTransitions() - 9 concrete State subclasses (1:1 to coreshop_* state machines) - 8 concrete Transition subclasses (replaces the single overloaded StateTransitionConfigurationType that was misused across 8 different workflows, mirroring the original ExtJS one-class-per-workflow pattern) Also gives Notification/Condition/StoresConfigurationType the same `block_prefix: coreshop_store_choice` as its rule-engine sibling so the EntityChoiceWidget renders the multi-store select. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Studio fixes for 5.1
# Conflicts: # .env # composer.json # docker-compose.yaml # src/CoreShop/Bundle/FrontendBundle/Resources/assets/package-lock.json
|
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR has been generated automatically.
Remember! The upmerge should always be merged with using
Merge pull requestbutton.In case of conflicts, please resolve them manually with usign the following commands: