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.11 or 1.12 <!-- see the comment below --> |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | https://github.com/Sylius/Sylius/pull/8632 |
| License | MIT |
Eager loading all countries would add extra 8ms - 10ms overhead to Sylius' boot up time. Creating a draft PR to see what test case would it break first.
Commits
-------
Prevent eager loading hundreds of countries
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|-----|
| Branch? | 1.12 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | fixes#15183 |
| License | MIT |
Refs video in #15183
When we login in addressing page after submit once the page, the reload process after login resubmit data, and keep sending `form[customer][email]`, that it doesn't be added in form.
So I unset these data on pre-submit.
I also change the csrf_error message for something more "understandable".
By this way, we can still have previous submitted data for address fields.
The other way, suggested by @Wojdylak, is to change this line https://github.com/Sylius/Sylius/blob/1.12/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-login.js#L50
by
```
window.location = window.location.href;
```
But using it, all already filled data are lost.
WDYT ? Would it be acceptable to lose such data, or should we keep them ?
Commits
-------
[Checkout] Prevent extra fields when login in on addressing page
Update src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php
Add tests that form doesn't display Extra fields error after login in checkout
Remove fr translation
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 | - |
| License | MIT |
Commits
-------
[API][Admin] Cover inventory
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/1.13 --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.12 and 1.13
```
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 | improvement after #15568
| License | MIT
Commits
-------
Use serialized name when displaying an error about a wrong request field type
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
In some patch version, Symfony updated the return type for one of the methods to `mixed`. PHPSpec doesn't support this return type, so I had to return `anything` manually.
Commits
-------
Add missing willReturn method calls to PHPSpecs
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 | - |
| License | MIT |
Commits
-------
[Maintenance][API] Marking more inapplicable scenarios with no-api
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | kinda |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | fixes#15606 |
| License | MIT |
Commits
-------
[Admin][UI] Fix csrf error breaking admin form
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License | MIT |
This PR updates the interval between each test browser element reaching attempt from `0.1s` to `1s`.
Commits
-------
[Behat] Change JavaScriptTestHelper interval from 0.1s to 1s
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
It is minor fix to https://github.com/Sylius/Sylius/pull/15549 PR
Commits
-------
Validate Paypal express checkout sandbox field type
