Merge pull request #1753 from HedicGuibert/fix-xmlDriver-type-error

ostrolucky · web-flow · commit 5a5be76b29e5 · 2024-02-10T21:29:45.000+01:00
diff --git a/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php b/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php
@@ -68,7 +68,7 @@ public function __construct($driver, array $namespaces, array $managerParameters
     public static function createXmlMappingDriver(array $namespaces, array $managerParameters = [], $enabledParameter = false, array $aliasMap = [], bool $enableXsdValidation = false)
     {
         $locator = new Definition(SymfonyFileLocator::class, [$namespaces, '.orm.xml']);
-        $driver  = new Definition(XmlDriver::class, [$locator, null, $enableXsdValidation]);
+        $driver  = new Definition(XmlDriver::class, [$locator, XmlDriver::DEFAULT_FILE_EXTENSION, $enableXsdValidation]);
 
         return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);
     }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function __construct($driver, array $namespaces, array $managerParameters`
`68`	`68`	`public static function createXmlMappingDriver(array $namespaces, array $managerParameters = [], $enabledParameter = false, array $aliasMap = [], bool $enableXsdValidation = false)`
`69`	`69`	`{`
`70`	`70`	`$locator = new Definition(SymfonyFileLocator::class, [$namespaces, '.orm.xml']);`
`71`		`- $driver = new Definition(XmlDriver::class, [$locator, null, $enableXsdValidation]);`
	`71`	`+ $driver = new Definition(XmlDriver::class, [$locator, XmlDriver::DEFAULT_FILE_EXTENSION, $enableXsdValidation]);`
`72`	`72`
`73`	`73`	`return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);`
`74`	`74`	`}`