Merge branch '6.1' into 6.2

* 6.1: Fix CS Compatibility with doctrine/annotations 2 [Console] Fix a test when pcntl is not available (following #48329) [FrameworkBundle] fix: fix typo about help
symfony · Dec 20, 2022 · dd43019 · dd43019
2 parents 1bd3b17 + ea506a7
commit dd43019
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Legacy/SymfonyTestsListenerTrait.php b/Legacy/SymfonyTestsListenerTrait.php
@@ -133,7 +133,7 @@ public function startTestSuite($suite)
             if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
                 if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
                     AnnotationRegistry::registerUniqueLoader('class_exists');
-                } else {
+                } elseif (method_exists(AnnotationRegistry::class, 'registerLoader')) {
                     AnnotationRegistry::registerLoader('class_exists');
                 }
             }

diff --git a/bootstrap.php b/bootstrap.php
@@ -30,7 +30,7 @@
 if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
     if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
         AnnotationRegistry::registerUniqueLoader('class_exists');
-    } else {
+    } elseif (method_exists(AnnotationRegistry::class, 'registerLoader')) {
         AnnotationRegistry::registerLoader('class_exists');
     }
 }