* 1.14:
Changes after CR
Add info to UPGRADE file
Add deprecations and configuration unit tests
Fix behat test
Skip svg sanitize test if package is not installed
Fix composerRequireChecker
Format fix
Add phpstan ignores
Adjust behat tests
Add tests
Add allowed types configuration and change validation
Remove enshrined/svg-sanitize dependency
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | continuation of #17277
| 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
-->
* 2.0:
Change sort_by filter to sylius_sort_by
Fix note in the UPGRADE file
[Composer] Bump TwigExtra to the 0.4 version
[UiBundle] Deprecate classes and services moved to TwigExtra package
Update upgrade file
[UserBundle] Unification of service names
Update upgrade file
[TaxonomyBundle] Unification os service names
Add note to UPGRADE guide
Use Twig Extra package
Update upgrade file
[ShippingBundle] Unification of service name
Update upgrade file
[ReviewBundle] Unification of service names
[PromotionBundle] Unification of sylius.registry_promotion_action
Update upgrade file
[TaxationBundle] Unification of service names
* 1.13:
[CI] Remove currently unneeded custom build
[API] Add default sorting order for customers admin GET endpoint
Change fixtures - add createdAt different time for customers
[Review] Change ReviewChangeListener doctrine event from postRemove to preRemove
[Composer] Remove conflict to doctrine/orm
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| 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
-->
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/payment-request -m "Resolve conflicts between 2.0 and payment-request"
```
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? | 2.0
| 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
-->
@GSadee we are now sure that the new Twig hooks branch is fixed.
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| 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
-->
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| New feature? | no
| BC breaks? | yes
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | fixes https://github.com/Sylius/Sylius/issues/13143,
replaces #13656
| 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
-->
* 1.14:
Fix note
Fix rebase
Add CONFLICTS.md note
Add gedmo/doctrine-extensions conflict
Update upgrade file
[MoneyBundle] Unification of service names
Update upgrade file
[LocaleBundle] Unification of service names
[InventoryBundle] Unification of service names
Mirror improvements
Update upgrade file
[CurrencyBundle] Unification of service names
