kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 09:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '1.12' into 1.13

Browse source 
* 1.12:
  Update UPGRADE-1.12.md
  Update Component/Core composer.json
  Update OrderBundle composer.json
  Update composer.json
This commit is contained in:
Grzegorz Sadowski 2023-08-18 10:32:24 +02:00
commit ce70d2b629
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UPGRADE-1.12.md
View file

@ -4,7 +4,7 @@
constructor argument has been made optional and is `null` by default, subsequently the first argument of
`sylius.form.type.attribute_type.select.choices_collection` has been removed.
# UPGRADE FROM `v1.12.8` TO `v1.12.9`
# UPGRADE FROM `v1.12.9` TO `v1.12.10`
1. The `Sylius\Component\Core\OrderProcessing\OrderPaymentProcessor` constructor has been changed:
```diff

2
composer.json
View file

@ -126,7 +126,7 @@
"symfony/security-csrf": "^5.4.21 || ^6.0",
"symfony/security-http": "^5.4.21 || ^6.0",
"symfony/serializer": "^5.4.21 || ^6.0",
"symfony/service-contracts": "^2.5",
"symfony/service-contracts": "^2.5 || ^3.0",
"symfony/string": "^5.4.21 || ^6.0",
"symfony/templating": "^5.4.21 || ^6.0",
"symfony/translation": "^5.4.21 || ^6.0",

2
src/Sylius/Bundle/OrderBundle/composer.json
View file

@ -34,7 +34,7 @@
"sylius/order": "^1.12",
"sylius/resource-bundle": "^1.9",
"symfony/framework-bundle": "^5.4.21 || ^6.0",
"symfony/service-contracts": "^2.5",
"symfony/service-contracts": "^2.5 || ^3.0",
"symfony/templating": "^5.4.21 || ^6.0"
},
"conflict": {

2
src/Sylius/Component/Core/composer.json
View file

@ -55,7 +55,7 @@
"symfony/http-client": "^5.4.21 || ^6.0",
"symfony/http-foundation": "^5.4.21 || ^6.0",
"symfony/mime": "^5.4.21 || ^6.0",
"symfony/service-contracts": "^2.5",
"symfony/service-contracts": "^2.5 || ^3.0",
"symfony/string": "^5.4.21 || ^6.0",
"webmozart/assert": "^1.9",
"laminas/laminas-stdlib": "^3.3.1"