Skip to content

Commit

Permalink
minor symfony#44767 Remove direct dependency on composer/package-vers…
Browse files Browse the repository at this point in the history
…ions-deprecated (stof)

This PR was merged into the 5.3 branch.

Discussion
----------

Remove direct dependency on composer/package-versions-deprecated

| Q             | A
| ------------- | ---
| Branch?       | 5.3
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | n/a
| License       | MIT
| Doc PR        | n/a

This dependency in the doctrine-bridge was added to enforce the replacement of the ocramius/package-versions package used by the ORM, to keep support for PHP versions we needed. But as of 2.7.4, the ORM switched its dependency, so this is not necessary anymore.

This contributes to symfony#44726

Commits
-------

c106a6b Remove direct dependency on composer/package-versions-deprecated
  • Loading branch information
nicolas-grekas committed Dec 25, 2021
2 parents 908b21f + c106a6b commit 231918b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,12 @@
"async-aws/ses": "^1.0",
"async-aws/sqs": "^1.0",
"cache/integration-tests": "dev-master",
"composer/package-versions-deprecated": "^1.8",
"doctrine/annotations": "^1.12",
"doctrine/cache": "^1.6|^2.0",
"doctrine/collections": "~1.0",
"doctrine/data-fixtures": "^1.1",
"doctrine/dbal": "^2.10|^3.0",
"doctrine/orm": "^2.7.3",
"doctrine/orm": "^2.7.4",
"guzzlehttp/promises": "^1.4",
"masterminds/html5": "^2.6",
"monolog/monolog": "^1.25.1|^2",
Expand Down
5 changes: 2 additions & 3 deletions src/Symfony/Bridge/Doctrine/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"symfony/service-contracts": "^1.1|^2"
},
"require-dev": {
"composer/package-versions-deprecated": "^1.8",
"symfony/stopwatch": "^4.4|^5.0",
"symfony/cache": "^5.1",
"symfony/config": "^4.4|^5.0",
Expand All @@ -48,12 +47,12 @@
"doctrine/collections": "~1.0",
"doctrine/data-fixtures": "^1.1",
"doctrine/dbal": "^2.10|^3.0",
"doctrine/orm": "^2.7.3"
"doctrine/orm": "^2.7.4"
},
"conflict": {
"doctrine/dbal": "<2.10",
"doctrine/lexer": "<1.1",
"doctrine/orm": "<2.7.3",
"doctrine/orm": "<2.7.4",
"phpunit/phpunit": "<5.4.3",
"symfony/dependency-injection": "<4.4",
"symfony/form": "<5.1",
Expand Down

0 comments on commit 231918b

Please sign in to comment.