Skip to content

Commit

Permalink
Merge pull request #873 from loic425/dev-dependencies/move-winzou
Browse files Browse the repository at this point in the history
Move winzou state machine on optional requirements
  • Loading branch information
GSadee authored Oct 7, 2024
2 parents 9aeddfe + 1dd9012 commit 816e7ea
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ jobs:
name: Run lint container without winzou/state-machine-bundle package
if: matrix.app_env == 'test'
run: |
composer remove winzou/state-machine-bundle --no-scripts
composer remove --dev winzou/state-machine-bundle --no-scripts
(cd tests/Application && bin/console cache:clear --env=test_without_state_machine)
(cd tests/Application && bin/console lint:container --env=test_without_state_machine)
composer require winzou/state-machine-bundle --no-scripts
Expand Down
1 change: 1 addition & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ In preparation of removal, following dependencies were moved to optional require
* friendsofsymfony/rest-bundle
* jms/serializer-bundle
* willdurand/hateoas-bundle
* winzou/state-machine-bundle

## UPGRADE FOR `1.11.x`

Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"symfony/validator": "^5.4 || ^6.4 || ^7.0",
"symfony/yaml": "^5.4 || ^6.4 || ^7.0",
"webmozart/assert": "^1.8",
"winzou/state-machine-bundle": "^0.6.2",
"willdurand/negotiation": "^3.1"
},
"replace": {
Expand Down Expand Up @@ -86,14 +85,16 @@
"symfony/security-bundle": "^5.4 || ^6.4 || ^7.0",
"twig/twig": "^3.0",
"vimeo/psalm": "^5.20",
"willdurand/hateoas-bundle": "^2.0"
"willdurand/hateoas-bundle": "^2.0",
"winzou/state-machine-bundle": "^0.6.2"
},
"conflict": {
"doctrine/orm": "<2.18 || ^3.0",
"doctrine/doctrine-bundle": "<2.0 || ^3.0",
"friendsofsymfony/rest-bundle": "<3.0",
"jms/serializer-bundle": "<3.5",
"willdurand/hateoas-bundle": "<2.0 || ^2.6",
"winzou/state-machine-bundle": "<0.6.2",
"twig/twig": "<3.0"
},
"suggest": {
Expand Down

0 comments on commit 816e7ea

Please sign in to comment.