This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.13
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | -
| License | MIT
Commits
-------
[API] Fix translation.name filters
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 <this-pr-number>
git merge upstream/1.14 -m "Resolve conflicts between 1.13 and 1.14"
```
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? | 1.13
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets |
| License | MIT
I would like to better reflect the current projections for 2.0 and, at
the same time, extend support for 1.13 to overlap with 1.14 for at least
a few months.
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 <this-pr-number>
git merge upstream/1.14 -m "Resolve conflicts between 1.13 and 1.14"
```
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 was merged into the 1.13 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.13
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | fixes #X, partially #Y, mentioned in #Z
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted against the 2.0 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
-->
Fix for Customer admin POST example in the docs
Commits
-------
Fix ShopUser docs example
This PR was merged into the 1.14 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.14 <!-- see the comment below -->
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | yes <!-- don't forget to update the UPGRADE-*.md file -->
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted against the 2.0 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
-->
deprecates as it has been removed [here](https://github.com/Sylius/Sylius/pull/16646)
Commits
-------
Deprecate PromotionCouponPromotionFilter
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 <this-pr-number>
git merge upstream/1.14 -m "Resolve conflicts between 1.13 and 1.14"
```
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 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
-------
Refactor GUS info
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.13
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | #14786
| License | MIT
Commits
-------
Fix Full CI to run 2.0
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 <this-pr-number>
git merge upstream/1.14 -m "Resolve conflicts between 1.13 and 1.14"
```
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 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 | [action](https://github.com/Sylius/Sylius/actions/runs/10086616660/job/27889633254)
| License | MIT
Fixed intermittent test failures in GitHub Actions
Commits
-------
[ChannelsTest] Use inArray to check locales
| Q | A
|-----------------|-----
| Branch? | 1.14
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets |
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 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
-->
This PR was merged into the 1.13 branch.
Discussion
----------
Using the callback wrapper to resolve the LocaleChoiceType keeping old entity objects during tests where both the form is build and submit through the Symfony PhpUnit WebTestCase.
Also see https://github.com/Sylius/Sylius/issues/16572
| Q | A
|-----------------|-----
| Branch? | 1.13
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | fixes #https://github.com/Sylius/Sylius/issues/16572
| License | MIT
Commits
-------
fix(locales): use callback wrapper for choices
Remove unused argument
Revert "Remove unused argument
"
Removing the unused $options argument for the variable is not used in the function.
Co-authored-by: Rafał Jaskulski <40125720+Rafikooo@users.noreply.github.com>
* 1.13:
[API] Add note about disabling adjustment GET endpoint to UPGRADE file
[API] Remove unnecessarily added HeadersBuilder class
Add phpunit test
Disable adjustments shop API endpoint
* 1.12:
[API] Add note about disabling adjustment GET endpoint to UPGRADE file
[API] Remove unnecessarily added HeadersBuilder class
Add phpunit test
Disable adjustments shop API endpoint
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<!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets |
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted against the 2.0 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
-->
Commits
-------
de2dec6dbf Disable adjustments shop API endpoint
37f812d825 Add phpunit test
61c984228a [API] Remove unnecessarily added HeadersBuilder class
a9c2ff77bb [API] Add note about disabling adjustment GET endpoint to UPGRADE file
This PR was merged into the 1.13 branch.
Discussion
----------
This PR has been generated automatically.
For more details see [refactor.yaml](/Sylius/Sylius/blob/1.12/.github/workflows/refactor.yaml).
Commits
-------
3135b91fe3 [CS][DX] Refactor
I always didn't like behat errors like:
Given I have product "Xxxx" in the cart
(FriendsOfBehat\PageObjectExtension\Page\UnexpectedPageException)
Not informative. Is it unexpected page (i.e. wrong page opened)? Or is
it unexpected exception?
Now it shows:
Is not open: Could not open the page:
"http://localhost:8080/en_US/products/xxx". Received an error status
code: 500 {"slug":"xxx"}
(FriendsOfBehat\PageObjectExtension\Page\UnexpectedPageException)
Feel free to improve or change this commit.
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 (1.12 would be nice too) |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | ? |
| Deprecations? | no? |
| Related tickets | none |
| 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
-->
Using the callback wrapper to resolve the LocaleChoiceType keeping old entity objects during tests where both the form is build and submit through the Symfony PhpUnit WebTestCase.
Also see https://github.com/Sylius/Sylius/issues/16572Fixes#16572
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
| Deprecations? | no <!-- don't forget to update the UPGRADE-*.md file -->
| License | MIT
It appears that these scenarios were not taken into account in our CI.
Commits
-------
0182292e5b [Behat] Enable accessing product edit page from show page scenarios
