Merge branch '7.0' into 7.1

nicolas-grekas · nicolas-grekas · commit b55b9495abd5 · 2024-01-30T14:55:25.000+01:00
* 7.0:
  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
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']);
             }

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,9 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder`
`193`	`193`	`array_values($driverPaths),`
`194`	`194`	`]);`
`195`	`195`	`}`
`196`		`- if (str_contains($mappingDriverDef->getClass(), 'yml') \|\| str_contains($mappingDriverDef->getClass(), 'xml')) {`
	`196`	`+ if (str_contains($mappingDriverDef->getClass(), 'yml') \|\| str_contains($mappingDriverDef->getClass(), 'xml')`
	`197`	`+ \|\| str_contains($mappingDriverDef->getClass(), 'Yaml') \|\| str_contains($mappingDriverDef->getClass(), 'Xml')`
	`198`	`+ ) {`
`197`	`199`	`$mappingDriverDef->setArguments([array_flip($driverPaths)]);`
`198`	`200`	`$mappingDriverDef->addMethodCall('setGlobalBasename', ['mapping']);`
`199`	`201`	`}`