Skip to content

Commit

Permalink
Merge pull request #327 from W0rma/annotations-2
Browse files Browse the repository at this point in the history
Allow doctrine/annotations:2
  • Loading branch information
goetas authored Jan 31, 2023
2 parents 9a1830d + 57be209 commit 39bae03
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
],
"require": {
"php": "^7.2 | ^8.0",
"doctrine/annotations": "^1.13.2",
"doctrine/annotations": "^1.13.2 || ^2.0",
"jms/metadata": "^2.0",
"jms/serializer": "^3.18.2",
"symfony/expression-language": "~3.0 || ~4.0 || ~5.0 || ~6.0"
},
"require-dev": {
"phpunit/phpunit": "^7 | ^9.5.10",
"doctrine/coding-standard": "^5.0 | ^8.0",
"doctrine/persistence": "^1.3.4",
"doctrine/persistence": "^1.3.4 | ^2.0 | ^3.0",
"pagerfanta/core": "^2.4 || ^3.0",
"phpdocumentor/type-resolver": "^1.5.1",
"phpspec/prophecy-phpunit": "^2.0.1",
Expand Down
5 changes: 4 additions & 1 deletion tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@

$loader->add('Hateoas\Tests', __DIR__);

AnnotationRegistry::registerLoader('class_exists');
// Method has been removed in doctrine/annotations:2
if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
AnnotationRegistry::registerLoader('class_exists');
}

0 comments on commit 39bae03

Please sign in to comment.