Skip to content

Commit

Permalink
bug #202 Conflict with SyliusInvoicingPlugin below 0.16.0 (Zales0123)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
SirDomin authored Jul 9, 2021
2 parents 1eebec9 + 76dfc7c commit c60b9a9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
node: ["10.x"]
mysql: ["5.7", "8.0"]
symfony: ["^4.4", "^5.2"]
sylius: ["~1.8.0", "~1.9.0", "~1.10@dev"]
sylius: ["~1.8.0", "~1.9.0", "~1.10.0"]

exclude:
-
Expand All @@ -33,7 +33,7 @@ jobs:
symfony: "^5.2"
-
php: "7.3"
sylius: "~1.10@dev"
sylius: "~1.10.0"
-
php: "8.0"
sylius: "~1.8.0"
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
},
"conflict": {
"symfony/doctrine-bridge": "4.4.16",
"doctrine/doctrine-bundle": "2.3.0"
"doctrine/doctrine-bundle": "2.3.0",
"sylius/invoicing-plugin": "<0.16.0"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit c60b9a9

Please sign in to comment.