Skip to content

Commit c60b9a9

Browse files
authored
bug #202 Conflict with SyliusInvoicingPlugin below 0.16.0 (Zales0123)
This PR was merged into the 1.0-dev branch. Discussion ---------- Before [this change](Sylius/InvoicingPlugin#226), it was impossible to place the PayPal order from the Payment page, due to some problems with Invoice generation (missing number on order). Therefore, we should require at least SyliusInvoicingPlugin v0.16.0 and release a new version asap 🖖 🚀 Commits ------- 5df3399 Conflict with SyliusInvoicingPlugin below 0.16.0 76dfc7c Fix build
2 parents 1eebec9 + 76dfc7c commit c60b9a9

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
node: ["10.x"]
2323
mysql: ["5.7", "8.0"]
2424
symfony: ["^4.4", "^5.2"]
25-
sylius: ["~1.8.0", "~1.9.0", "~1.10@dev"]
25+
sylius: ["~1.8.0", "~1.9.0", "~1.10.0"]
2626

2727
exclude:
2828
-
@@ -33,7 +33,7 @@ jobs:
3333
symfony: "^5.2"
3434
-
3535
php: "7.3"
36-
sylius: "~1.10@dev"
36+
sylius: "~1.10.0"
3737
-
3838
php: "8.0"
3939
sylius: "~1.8.0"

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
},
4444
"conflict": {
4545
"symfony/doctrine-bridge": "4.4.16",
46-
"doctrine/doctrine-bundle": "2.3.0"
46+
"doctrine/doctrine-bundle": "2.3.0",
47+
"sylius/invoicing-plugin": "<0.16.0"
4748
},
4849
"autoload": {
4950
"psr-4": {

0 commit comments

Comments
 (0)