* 1.12:
[Behat] Minor scenarios improvements
Fixes after CR
Test adding similar products
Test adding new simple product
Test adding new taxon
[Behat] Minor scenarios improvements after code review
[Checkout] Add scenario for preventing from a potential XSS attack
[AddressBook] Add scenario for preventing from a potential XSS attack
Use function from UIBundle
Add sanitizer function to UIBundle
Add js sanitizeInput function
Fix product-auto-complete
Use function from UIBundle
Fix potential xss in admin panel
[Maintenance] Remove unnecessary line
[Maintenance] Update docker docs
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.13 -m "Resolve conflicts between 1.12 and 1.13"
```
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
```
* 1.12:
Update docs/cookbook/images/image-on-entity.rst
Update docs/cookbook/images/image-on-entity.rst
Update docs/cookbook/images/image-on-entity.rst
Update docs/cookbook/images/image-on-entity.rst
add docs for adding image to entity via one-to-one association
[Promotion] Ignore coupon based promotions when processing an order with no coupon
Add a conflict for doctrine/orm:2.15.2
Fix typo
[Fixture] Revert injected repository type
[PHPStan] Fix Psalm (#14019)
[PHPStan] Fix non nullable variable (#14019)
[PHPStan] Fix PHPStan to continue support for Sf < 6 (#14019)
[PHPStan] Fix PHPStan level 5 class inheritance errors (#14019)
[PHPStan] Bump to level 5 (#14019)
* 1.12:
Avoid double label translation
Replace http with https
Replace http with https
Replace Doctrine Persistence Object Manager API docs URL to another reference in the docs, since the former was removed (see https://twitter.com/doctrineproject/status/1116080889996431362)
fix Symfony XML schema namespace
Update spreecommerce adjustments docs URL
fix Symfony XML schema namespace
Replace Doctrine ORM Query Builder API docs URL to another reference in the docs, since the former was removed (see https://twitter.com/doctrineproject/status/1116080889996431362)
Update spreecommerce inventory docs URL
Update spreecommerce adjustments docs URL
Update spreecommerce products docs URL
Update spreecommerce taxonomies and taxons user docs URL
Replace dead Payum URL with its GitHub repo URL
Remove references to api.sylius.com which was shut down
remove dead link to codebetter.com
fix message of the length constraint on email
* 1.12:
Add var/log directory to artifacts on pipeline fail
Remove obsolete information about cantons in Belgium
Type in fixtures.rst
[Docs] Add guide on how to add another implementation of UnitRefundInterface
* 1.12:
Fix CI
Update Plus' dependencies' versions requirements
Update sylius_plus_installation.rst
Update versions in the "Submitting a Patch" doc
Add adjusting shop regex section to disabling-localised-urls.rst
[Architecture] Ensure HTTP errors are not dispatched in command handlers
[Behat] add scenario for disabled admin
Added promotion form theme override in UPGRADE-1.9.md
This PR was merged into the 1.12 branch.
Discussion
----------
Commits
-------
495711e03c docs/cookbook/shop/embedding-products.rst
Fix controller declaration
