Merge branch '5.4' into 6.0

derrabus · derrabus · commit 76a74c369150 · 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/Command/ConfigDumpReferenceCommand.php b/Command/ConfigDumpReferenceCommand.php
@@ -97,7 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
             $errorIo->comment([
                 'Provide the name of a bundle as the first argument of this command to dump its default configuration. (e.g. <comment>config:dump-reference FrameworkBundle</comment>)',
-                'For dumping a specific option, add its path as the second argument of this command. (e.g. <comment>config:dump-reference FrameworkBundle profiler.matcher</comment> to dump the <comment>framework.profiler.matcher</comment> configuration)',
+                'For dumping a specific option, add its path as the second argument of this command. (e.g. <comment>config:dump-reference FrameworkBundle http_client.default_options</comment> to dump the <comment>framework.http_client.default_options</comment> configuration)',
             ]);
 
             return 0;
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -1570,8 +1570,12 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
         $loader->load('annotations.php');
 
         if (!method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
-            $container->getDefinition('annotations.dummy_registry')
-                ->setMethodCalls([['registerLoader', ['class_exists']]]);
+            if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
+                $container->getDefinition('annotations.dummy_registry')
+                    ->setMethodCalls([['registerLoader', ['class_exists']]]);
+            } else {
+                $container->removeDefinition('annotations.dummy_registry');
+            }
         }
 
         if ('none' === $config['cache']) {
diff --git a/Resources/config/annotations.php b/Resources/config/annotations.php
@@ -25,7 +25,7 @@
         ->set('annotations.reader', AnnotationReader::class)
             ->call('addGlobalIgnoredName', [
                 'required',
-                service('annotations.dummy_registry'), // dummy arg to register class_exists as annotation loader only when required
+                service('annotations.dummy_registry')->ignoreOnInvalid(), // dummy arg to register class_exists as annotation loader only when required
             ])
 
         ->set('annotations.dummy_registry', AnnotationRegistry::class)
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "symfony/routing": "^5.4|^6.0"
     },
     "require-dev": {
-        "doctrine/annotations": "^1.13.1",
+        "doctrine/annotations": "^1.13.1|^2",
         "doctrine/persistence": "^1.3|^2|^3",
         "symfony/asset": "^5.4|^6.0",
         "symfony/browser-kit": "^5.4|^6.0",
