This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.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
git merge upstream/2.0 --no-commit
```
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
change the commit title to
```
Resolve conflicts between 1.13 and 2.0
```
* 2.0: (172 commits)
[Admin] Change name of official support section in menu and adjust translations
Add all translations & change label
Add business support CTA to admin panel
[PromotionBundle] Add prefix to validation groups for promotion action/rule
[PromotionBundle][PromotionRule] Add available type to validation message
[PromotionBundle][PromotionAction] Add available type to validation message
Update upgrade file
[PromotionBundle] Split PromotionRuleValidator to PromotionRuleGroupValidator and PromotionRuleTypeValidator
[PromotionBundle] Split PromotionActionValidator to PromotionActionGroupValidator and PromotionActionTypeValidator
Add prefix sylius_ to validation groups
Update upgrade file
[PromotionBundle] Remove constraints from FormType to avoid double constraints
[PromotionBundle] Move logic from PromotionRuleGroupValidator to PromotionRuleValidator
[PromotionBundle] Move logic from PromotionActionGroupValidator to PromotionActionValidator
[PromotionBundle] Add parameters validation groups for promotion action and promotion rule
[ECS] Apply types order changes
[ECS] Add union types ordering rule
[ECS] Apply ecs fixes
[ChannelsTest] use inArray to check locales
[ApiBundle] Add contract tests for ProductTaxon resource
...
* 1.13:
Exclude PHP 8.0/Symfony 6.4 from workflows' matrixes
[Maintenance] Fix postgres behats
Fix product name's casing in the Behat scenario
Add the sylius-labs/suite-tags-extension package
[Dependencies] Change possible versions of doctrine/persistence
[CI] Update Symfony versions in build
[Behat][UI] Add strong typing in the CartContext class
[ECS] Apply another ecs fixes
[ECS] Apply ecs fixes
[ECS] Apply ecs fixes in the tests directory
[ECS] Add checking in the tests directory
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | n/a
| License | MIT
I only added the package to fix full build. I skipped adding isolating to the `1.12`'s workflows.
Commits
-------
Add the sylius-labs/suite-tags-extension package
Fix product name's casing in the Behat scenario
[Maintenance] Fix postgres behats
