bug #48916 [FrameworkBundle] restore call to addGlobalIgnoredName (alexislefebvre)

nicolas-grekas · nicolas-grekas · commit 996f93e0e88a · 2023-01-09T09:25:08.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [FrameworkBundle] restore call to addGlobalIgnoredName | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #48792 and replace #48912 | License | MIT | Doc PR | no The service `annotations.dummy_registry` is unregistered with `doctrine/annotations` v2. This had the unexpected effect to break the call to `addGlobalIgnoredName` with `doctrine/annotations` v2 : #48792 (comment) By using `nullOnInvalid` instead of `ignoreOnInvalid`, the call to `addGlobalIgnoredName` is restored. These changes can be tested with this reproducer: https://github.com/alexislefebvre/symfony_bug_app_48792 Downgrading and upgrading `doctrine/annotations` become possible: ```bash composer require doctrine/annotations:^1.13.0 --with-all-dependencies composer require doctrine/annotations:^2.0 --with-all-dependencies ``` Thanks to `@derrabus`: #48912 (comment) Commits ------- e058874 [FrameworkBundle] restore call to addGlobalIgnoredName
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1631,11 +1631,14 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
         $loader->load('annotations.php');
 
+        // registerUniqueLoader exists since doctrine/annotations v1.6
         if (!method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
+            // registerLoader exists only in doctrine/annotations v1
             if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
                 $container->getDefinition('annotations.dummy_registry')
                     ->setMethodCalls([['registerLoader', ['class_exists']]]);
             } else {
+                // remove the dummy registry when doctrine/annotations v2 is used
                 $container->removeDefinition('annotations.dummy_registry');
             }
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php
@@ -26,7 +26,7 @@
         ->set('annotations.reader', AnnotationReader::class)
             ->call('addGlobalIgnoredName', [
                 'required',
-                service('annotations.dummy_registry')->ignoreOnInvalid(), // dummy arg to register class_exists as annotation loader only when required
+                service('annotations.dummy_registry')->nullOnInvalid(), // dummy arg to register class_exists as annotation loader only when required
             ])
 
         ->set('annotations.dummy_registry', AnnotationRegistry::class)

Original file line number	Diff line number	Diff line change
`@@ -1631,11 +1631,14 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde`
`1631`	`1631`
`1632`	`1632`	`$loader->load('annotations.php');`
`1633`	`1633`
	`1634`	`+ // registerUniqueLoader exists since doctrine/annotations v1.6`
`1634`	`1635`	`if (!method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {`
	`1636`	`+ // registerLoader exists only in doctrine/annotations v1`
`1635`	`1637`	`if (method_exists(AnnotationRegistry::class, 'registerLoader')) {`
`1636`	`1638`	`$container->getDefinition('annotations.dummy_registry')`
`1637`	`1639`	`->setMethodCalls([['registerLoader', ['class_exists']]]);`
`1638`	`1640`	`} else {`
	`1641`	`+ // remove the dummy registry when doctrine/annotations v2 is used`
`1639`	`1642`	`$container->removeDefinition('annotations.dummy_registry');`
`1640`	`1643`	`}`
`1641`	`1644`	`}`