Merge branch '6.4' into 7.0

* 6.4: Fix merge [Routing] Fixed priority getting lost when defining prefix array [DoctrineBridge] Fix detection of Xml/Yaml driver in DoctrineExtension [Messenger] PhpSerializer: TypeError should throw MessageDecodingFailedException
symfony · Jan 30, 2024 · fbea8d2 · fbea8d2
2 parents dc9b5ef + 9c9a44b
commit fbea8d2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/DependencyInjection/AbstractDoctrineExtension.php b/DependencyInjection/AbstractDoctrineExtension.php
@@ -193,7 +193,9 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder
                     array_values($driverPaths),
                 ]);
             }
-            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']);
             }