diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e59af1a9..afbad5198 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -157,8 +157,9 @@ jobs: - name: Run smoke tests without friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle packages run: | - composer remove friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --no-scripts + composer remove --dev friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --no-scripts (cd tests/Application && bin/console cache:clear --env=test_without_fosrest) + (cd tests/Application && bin/console lint:container) composer require friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --no-scripts - diff --git a/UPGRADE.md b/UPGRADE.md index 36106ecd4..74bced9fd 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,3 +1,13 @@ +## UPGRADE FOR `1.12.x` + +### FROM `1.11.x` to `1.12.x` + +We move these following dependencies on optional requirements, so explicit them in your app requirements if you need them. + +* friendsofsymfony/rest-bundle +* jms/serializer-bundle +* willdurand/hateoas-bundle + ## UPGRADE FOR `1.11.x` ### FROM `1.10.x` to `1.11.x` diff --git a/composer.json b/composer.json index 76debadd2..c31ece689 100644 --- a/composer.json +++ b/composer.json @@ -33,9 +33,7 @@ "doctrine/event-manager": "^1.1", "doctrine/inflector": "^1.4 || ^2.0", "doctrine/persistence": "^2.0 || ^3.0", - "friendsofsymfony/rest-bundle": "^3.0", "gedmo/doctrine-extensions": "^2.4.12 || ^3.0", - "jms/serializer-bundle": "^3.5 || ^4.0 || ^5.0", "sylius/registry": "^1.2", "symfony/config": "^5.4 || ^6.0", "symfony/deprecation-contracts": "^2.1 || ^3.0", @@ -52,7 +50,6 @@ "symfony/validator": "^5.4 || ^6.0", "symfony/yaml": "^5.4 || ^6.0", "webmozart/assert": "^1.8", - "willdurand/hateoas-bundle": "^2.0", "winzou/state-machine-bundle": "^0.6", "willdurand/negotiation": "^3.1" }, @@ -61,6 +58,8 @@ }, "require-dev": { "doctrine/orm": "^2.5", + "friendsofsymfony/rest-bundle": "^3.0", + "jms/serializer-bundle": "^3.5 || ^4.0 || ^5.0", "lchrusciel/api-test-case": "^5.0", "matthiasnoback/symfony-dependency-injection-test": "^4.2.1", "pagerfanta/pagerfanta": "^3.7 || ^4.0", @@ -83,7 +82,13 @@ "rector/rector": "^0.18.2", "symfony/messenger": "^5.4 || ^6.0", "symfony/serializer": "^5.4 || ^6.0", - "symfony/security-bundle": "^5.4 || ^6.0" + "symfony/security-bundle": "^5.4 || ^6.0", + "willdurand/hateoas-bundle": "^2.0" + }, + "conflict": { + "friendsofsymfony/rest-bundle": "<3.0", + "jms/serializer-bundle": "<3.5", + "willdurand/hateoas-bundle": "<2.0" }, "suggest": { "doctrine/orm": "^2.5",