Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 5.4:
  Fix CS
  Compatibility with doctrine/annotations 2
  [Console] Fix a test when pcntl is not available (following #48329)
  [FrameworkBundle] fix: fix typo about help
  • Loading branch information
derrabus committed Dec 20, 2022
2 parents 3b7384f + 4ce2df9 commit 61687a0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ protected function configureRoute(Route $route, \ReflectionClass $class, \Reflec
{
}
};
AnnotationRegistry::registerLoader('class_exists');
if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
AnnotationRegistry::registerLoader('class_exists');
}
}

public function testDefaultRouteName()
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"symfony/yaml": "^5.4|^6.0",
"symfony/expression-language": "^5.4|^6.0",
"symfony/dependency-injection": "^5.4|^6.0",
"doctrine/annotations": "^1.12",
"doctrine/annotations": "^1.12|^2",
"psr/log": "^1|^2|^3"
},
"conflict": {
Expand Down

0 comments on commit 61687a0

Please sign in to comment.