bug #58772 [DoctrineBridge] Backport detection fix of Xml/Yaml driver in DoctrineExtension (MatTheCat)

nicolas-grekas · nicolas-grekas · commit e1da961f230e · 2024-11-06T09:23:08.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [DoctrineBridge] Backport detection fix of Xml/Yaml driver in DoctrineExtension | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix doctrine/DoctrineBundle#1832 | License | MIT #53681 got merged on 6.4, but the DoctrinBundle still needs it on 5.4 😅 Commits ------- f7b61a2 [DoctrineBridge] Backport #53681
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -220,7 +220,9 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder
                 ]);
             }
             $mappingDriverDef->setPublic(false);
-            if (str_contains($mappingDriverDef->getClass(), 'yml') || str_contains($mappingDriverDef->getClass(), 'xml')) {
+            if (str_contains($mappingDriverDef->getClass(), 'yml') || str_contains($mappingDriverDef->getClass(), 'xml')
+                || str_contains($mappingDriverDef->getClass(), 'Yaml') || str_contains($mappingDriverDef->getClass(), 'Xml')
+            ) {
                 $mappingDriverDef->setArguments([array_flip($driverPaths)]);
                 $mappingDriverDef->addMethodCall('setGlobalBasename', ['mapping']);
             }

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,9 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder`
`220`	`220`	`]);`
`221`	`221`	`}`
`222`	`222`	`$mappingDriverDef->setPublic(false);`
`223`		`- if (str_contains($mappingDriverDef->getClass(), 'yml') \|\| str_contains($mappingDriverDef->getClass(), 'xml')) {`
	`223`	`+ if (str_contains($mappingDriverDef->getClass(), 'yml') \|\| str_contains($mappingDriverDef->getClass(), 'xml')`
	`224`	`+ \|\| str_contains($mappingDriverDef->getClass(), 'Yaml') \|\| str_contains($mappingDriverDef->getClass(), 'Xml')`
	`225`	`+ ) {`
`224`	`226`	`$mappingDriverDef->setArguments([array_flip($driverPaths)]);`
`225`	`227`	`$mappingDriverDef->addMethodCall('setGlobalBasename', ['mapping']);`
`226`	`228`	`}`