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
```
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | n/a
| License | MIT
Commits
-------
Add missing @no-api tags in editing_product_review.feature
Add missing @api tags in recalculating_product_average_rating.feature
Cover scenarios in sorting_product_variants_within_product_by_position.feature
Cover scenarios in filtering_product_reviews.feature
Provide post-CR fixes
Remove duplicated step
[Behat][API] Minor improvements in managing variants contexts
[Behat][API] Refactor scenarios of sorting variants to have the same for UI and API contexts
[Behat] Fix scenario of browsing accepted reviews for case-sensitive PostreSQL
* 1.13:
[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
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Related tickets | N/A
| License | MIT
Commits
-------
e530c7d9ca [PromotionBundle] Add parameters validation groups for promotion action and promotion rule
235c7e0dd5 [PromotionBundle] Move logic from PromotionActionGroupValidator to PromotionActionValidator
53c31aa420 [PromotionBundle] Move logic from PromotionRuleGroupValidator to PromotionRuleValidator
36d2a5ac08 [PromotionBundle] Remove constraints from FormType to avoid double constraints
d56ce734c6 Update upgrade file
c021e3e3a1 Add prefix sylius_ to validation groups
99a94b92a3 [PromotionBundle] Split PromotionActionValidator to PromotionActionGroupValidator and PromotionActionTypeValidator
de77a13d2d [PromotionBundle] Split PromotionRuleValidator to PromotionRuleGroupValidator and PromotionRuleTypeValidator
eb4a50c92b Update upgrade file
dd50a6f3a6 [PromotionBundle][PromotionAction] Add available type to validation message
633cf30ab3 [PromotionBundle][PromotionRule] Add available type to validation message
1494fce8fe [PromotionBundle] Add prefix to validation groups for promotion action/rule
* 1.13:
[Admin] Change name of official support section in menu and adjust translations
Add all translations & change label
Add business support CTA to admin panel
[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
[Behat] Add API test coverage for features/promotion/tracking_usage folder
[ApiBundle][CatalogPromotion] Add order filters
[ApiBundle][ProductTaxon] Move deleting productTaxon to productTaxon resource
Use HeadersBuilder in the Customer Statistics API test
Use query_bus instead of command_bus for query handlers
Add handling the GetCustomerStatistics query
Create the GetCustomerStatistics query and the GetCustomerStatisticsHandler
Remove fr translation
Add tests that form doesn't display Extra fields error after login in checkout
Update src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php
Prevent eager loading hundreds of countries
[Checkout] Prevent extra fields when login in on addressing page
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? |yes |
| BC breaks? | no |
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License | MIT |
Let's eliminate another ambiguous convention 🕺
Reference: https://github.com/Sylius/Sylius/pull/15598#discussion_r1419413777
Proposal:
- null at the end
- the remaining types in alphabetical order
Commits
-------
[ECS] Apply ecs fixes
[ECS] Add union types ordering rule
[ECS] Apply types order changes
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Related tickets | N/A
| License | MIT
Commits
-------
9e8e797c81 [ApiBundle][ProductTaxon] Move deleting productTaxon to productTaxon resource
59c2798883 [ApiBundle][CatalogPromotion] Add order filters
4036f1f132 [Behat] Add API test coverage for features/promotion/tracking_usage folder
e8f1a0a831 [ApiBundle] Add contract tests for ProductTaxon resource
6de508c911 [ChannelsTest] use inArray to check locales
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | n/a
| License | MIT
Commits
-------
Create the GetCustomerStatistics query and the GetCustomerStatisticsHandler
Add handling the GetCustomerStatistics query
Use query_bus instead of command_bus for query handlers
Use HeadersBuilder in the Customer Statistics API test
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Related tickets | N/A
| License | MIT
#15535
Commits
-------
[AttributeBundle] Add unique entity constraint to AttributeTranslation
[PaymentBundle] Add unique entity constraint to PaymentMethodTranslation
[ProductBundle] Add unique entity constraint to ProductAssociationTypeTranslation
[ProductBundle] Add unique entity constraint to ProductOptionTranslation and ProductOptionValueTranslation
[ProductBundle] Add unique entity constraint to ProductTranslation
[ProductBundle] Add unique entity constraint to ProductVariantTranslation
[PromotionBundle] Add unique entity constraint to CatalogPromotionTranslation
[PromotionBundle] Add unique entity constraint to PromotionTranslation
[ShippingBundle] Add unique entity constraint to ShippingMethodTranslation
[TaxonBundle] Add unique entity constraint to TaxonTranslation
[Behat] Rename language to localeCode for improved clarity
[Api][Test] Improve spec test of throwing an exception if locale is not the same as key
Change message of unique entity constraint of translations
Rename unique constraint error message in translation
