Merge branch '5.4' into 6.0

derrabus · derrabus · commit 61687a0aa80f · 2022-12-20T17:40:04.000+01:00
* 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
diff --git a/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php b/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php
@@ -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()
diff --git a/composer.json b/composer.json
@@ -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": {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ protected function configureRoute(Route $route, \ReflectionClass $class, \Reflec`
`26`	`26`	`{`
`27`	`27`	`}`
`28`	`28`	`};`
`29`		`- AnnotationRegistry::registerLoader('class_exists');`
	`29`	`+ if (method_exists(AnnotationRegistry::class, 'registerLoader')) {`
	`30`	`+ AnnotationRegistry::registerLoader('class_exists');`
	`31`	`+ }`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public function testDefaultRouteName()`