Skip to content

Commit

Permalink
minor #33030 [Console] add missing conflict rule (xabbuh)
Browse files Browse the repository at this point in the history
This PR was merged into the 4.4 branch.

Discussion
----------

[Console] add missing conflict rule

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

The LockableTrait uses the LockFactory introduced in Symfony 4.4.

Commits
-------

a63df9c add missing conflict rule
  • Loading branch information
nicolas-grekas committed Aug 8, 2019
2 parents c2a3321 + a63df9c commit c61b4f2
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/Symfony/Component/Console/composer.json
Expand Up @@ -42,6 +42,7 @@
"conflict": {
"symfony/dependency-injection": "<3.4",
"symfony/event-dispatcher": "<4.3|>=5",
"symfony/lock": "<4.4",
"symfony/process": "<3.3"
},
"autoload": {
Expand Down

0 comments on commit c61b4f2

Please sign in to comment.