Skip to content

Commit dd43019

Browse files
committed
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
2 parents 1bd3b17 + ea506a7 commit dd43019

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Legacy/SymfonyTestsListenerTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function startTestSuite($suite)
133133
if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
134134
if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
135135
AnnotationRegistry::registerUniqueLoader('class_exists');
136-
} else {
136+
} elseif (method_exists(AnnotationRegistry::class, 'registerLoader')) {
137137
AnnotationRegistry::registerLoader('class_exists');
138138
}
139139
}

bootstrap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
3131
if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
3232
AnnotationRegistry::registerUniqueLoader('class_exists');
33-
} else {
33+
} elseif (method_exists(AnnotationRegistry::class, 'registerLoader')) {
3434
AnnotationRegistry::registerLoader('class_exists');
3535
}
3636
}

0 commit comments

Comments
 (0)