Skip to content

Commit

Permalink
bug #17166 [UPMERGE] 1.13 -> 1.14 (Wojdylak, GSadee)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.14 branch.

Discussion
----------

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.14 -m "Resolve conflicts between 1.13 and 1.14"
```

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.

Commits
-------

7289c29 Add the packages that have become optional in version 1.12 of the ResourceBundle.
e6722bb minor #17163 Add the packages that have become optional in version 1.12 of the ResourceBundle. (Wojdylak)
  • Loading branch information
GSadee authored Oct 9, 2024
2 parents 68f56b7 + e6722bb commit 30cf485
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/Sylius/Bundle/AttributeBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
}
],
"require": {
"friendsofsymfony/rest-bundle": "^3.0",
"jms/serializer-bundle": "^4.2",
"php": "^8.1",
"ramsey/uuid": "^4.0",
"stof/doctrine-extensions-bundle": "^1.4",
Expand All @@ -34,6 +36,7 @@
"symfony/framework-bundle": "^5.4.21 || ^6.4"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.12 || ^2.3.1",
"doctrine/orm": "^2.13",
"matthiasnoback/symfony-dependency-injection-test": "^4.2",
"phpspec/phpspec": "^7.2",
Expand Down
3 changes: 3 additions & 0 deletions src/Sylius/Bundle/ChannelBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@
}
],
"require": {
"friendsofsymfony/rest-bundle": "^3.0",
"jms/serializer-bundle": "^4.2",
"php": "^8.1",
"sylius/channel": "^1.13",
"sylius/resource-bundle": "^1.11",
"symfony/framework-bundle": "^5.4.21 || ^6.4"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.12 || ^2.3.1",
"doctrine/orm": "^2.13",
"matthiasnoback/symfony-dependency-injection-test": "^4.2",
"phpspec/phpspec": "^7.2",
Expand Down
3 changes: 3 additions & 0 deletions src/Sylius/Bundle/CurrencyBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
}
],
"require": {
"friendsofsymfony/rest-bundle": "^3.0",
"jms/serializer-bundle": "^4.2",
"php": "^8.1",
"sylius/currency": "^1.13",
"sylius/resource-bundle": "^1.11",
Expand All @@ -36,6 +38,7 @@
"twig/twig": "^1.0 || 3.9.0"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.12 || ^2.3.1",
"doctrine/orm": "^2.13",
"matthiasnoback/symfony-dependency-injection-test": "^4.2",
"phpspec/phpspec": "^7.2",
Expand Down
3 changes: 3 additions & 0 deletions src/Sylius/Bundle/InventoryBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
}
],
"require": {
"friendsofsymfony/rest-bundle": "^3.0",
"jms/serializer-bundle": "^4.2",
"php": "^8.1",
"sylius/inventory": "^1.13",
"sylius/resource-bundle": "^1.11",
Expand All @@ -37,6 +39,7 @@
"twig/twig": "^1.0 || 3.9.0"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.12 || ^2.3.1",
"doctrine/orm": "^2.13",
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
Expand Down
3 changes: 3 additions & 0 deletions src/Sylius/Bundle/LocaleBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
}
],
"require": {
"friendsofsymfony/rest-bundle": "^3.0",
"jms/serializer-bundle": "^4.2",
"php": "^8.1",
"sylius/locale": "^1.13",
"sylius/resource-bundle": "^1.11",
Expand All @@ -37,6 +39,7 @@
"twig/twig": "^1.0 || 3.9.0"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.12 || ^2.3.1",
"doctrine/orm": "^2.13",
"matthiasnoback/symfony-dependency-injection-test": "^4.2",
"friendsofphp/proxy-manager-lts": "^1.0.7",
Expand Down
3 changes: 3 additions & 0 deletions src/Sylius/Bundle/MoneyBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
}
],
"require": {
"friendsofsymfony/rest-bundle": "^3.0",
"jms/serializer-bundle": "^4.2",
"php": "^8.1",
"sylius/resource-bundle": "^1.11",
"symfony/framework-bundle": "^5.4.21 || ^6.4",
Expand All @@ -36,6 +38,7 @@
"twig/twig": "^1.0 || 3.9.0"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.12 || ^2.3.1",
"doctrine/orm": "^2.13",
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
Expand Down
3 changes: 3 additions & 0 deletions src/Sylius/Bundle/ProductBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
}
],
"require": {
"friendsofsymfony/rest-bundle": "^3.0",
"jms/serializer-bundle": "^4.2",
"php": "^8.1",
"stof/doctrine-extensions-bundle": "^1.4",
"sylius/attribute-bundle": "^1.13",
Expand All @@ -35,6 +37,7 @@
"symfony/framework-bundle": "^5.4.21 || ^6.4"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.12 || ^2.3.1",
"doctrine/orm": "^2.13",
"matthiasnoback/symfony-dependency-injection-test": "^4.2",
"mockery/mockery": "^1.4",
Expand Down

0 comments on commit 30cf485

Please sign in to comment.