Skip to content

Commit

Permalink
Merge pull request #614 from alexislefebvre/don-t-require-doctrine-an…
Browse files Browse the repository at this point in the history
…notations

composer: move doctrine/annotations to require-dev and suggest
  • Loading branch information
alexislefebvre authored Apr 4, 2023
2 parents 583ddfa + 565b987 commit 82092d0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ jobs:
symfony/validator=${{ matrix.symfony-version }}
symfony/yaml=${{ matrix.symfony-version }}
# This is needed to fix builds where the `annotation_reader` service may not be set up if
# the Annotations package is not in the production dependencies
- name: Require Annotations v1 to require for PHP 7
if: startsWith(matrix.php-version, '7.')
run: composer require --no-update "doctrine/annotations:^1.8.0"
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
],
"require": {
"php": "^7.2 || ^8.0",
"doctrine/annotations": "^1.3 || ^2.0",
"phpunit/phpunit": "^7.5.0 || ^8.0 || ^9.0",
"symfony/browser-kit": "^4.4 || ^5.1 || ^6.0",
"symfony/framework-bundle": "^4.4 || ^5.1 || ^6.0"
},
"require-dev": {
"ext-json": "*",
"doctrine/annotations": "^1.3 || ^2.0",
"doctrine/doctrine-bundle": "^2.1",
"doctrine/orm": "^2.7",
"monolog/monolog": "~1.11",
Expand All @@ -41,6 +41,7 @@
"symfony/framework-bundle": "4.3.0"
},
"suggest": {
"doctrine/annotations": "Required to use the @QueryCount(…) annotation",
"liip/test-fixtures-bundle": "Efficient loading of Doctrine fixtures in functional test-cases for Symfony applications"
},
"autoload": {
Expand Down

0 comments on commit 82092d0

Please sign in to comment.