Skip to content

Commit 82092d0

Browse files
Merge pull request #614 from alexislefebvre/don-t-require-doctrine-annotations
composer: move doctrine/annotations to require-dev and suggest
2 parents 583ddfa + 565b987 commit 82092d0

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ jobs:
6464
symfony/validator=${{ matrix.symfony-version }}
6565
symfony/yaml=${{ matrix.symfony-version }}
6666
67+
# This is needed to fix builds where the `annotation_reader` service may not be set up if
68+
# the Annotations package is not in the production dependencies
6769
- name: Require Annotations v1 to require for PHP 7
6870
if: startsWith(matrix.php-version, '7.')
6971
run: composer require --no-update "doctrine/annotations:^1.8.0"

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
],
1717
"require": {
1818
"php": "^7.2 || ^8.0",
19-
"doctrine/annotations": "^1.3 || ^2.0",
2019
"phpunit/phpunit": "^7.5.0 || ^8.0 || ^9.0",
2120
"symfony/browser-kit": "^4.4 || ^5.1 || ^6.0",
2221
"symfony/framework-bundle": "^4.4 || ^5.1 || ^6.0"
2322
},
2423
"require-dev": {
2524
"ext-json": "*",
25+
"doctrine/annotations": "^1.3 || ^2.0",
2626
"doctrine/doctrine-bundle": "^2.1",
2727
"doctrine/orm": "^2.7",
2828
"monolog/monolog": "~1.11",
@@ -41,6 +41,7 @@
4141
"symfony/framework-bundle": "4.3.0"
4242
},
4343
"suggest": {
44+
"doctrine/annotations": "Required to use the @QueryCount(…) annotation",
4445
"liip/test-fixtures-bundle": "Efficient loading of Doctrine fixtures in functional test-cases for Symfony applications"
4546
},
4647
"autoload": {

0 commit comments

Comments
 (0)