From b50850eb0c63df896bf0ef02a033ff213615a704 Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Fri, 22 Feb 2019 11:10:38 +0100 Subject: [PATCH] remove OTV --- .../Compiler/DoctrineOrmMappingsPass.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php b/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php index b9969ecb7..b116df82b 100644 --- a/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php +++ b/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php @@ -59,9 +59,8 @@ public function __construct($driver, array $namespaces, array $managerParameters */ public static function createXmlMappingDriver(array $namespaces, array $managerParameters = [], $enabledParameter = false, array $aliasMap = []) { - $arguments = [$namespaces, '.orm.xml']; - $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments); - $driver = new Definition('Doctrine\ORM\Mapping\Driver\XmlDriver', [$locator]); + $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', [$namespaces, '.orm.xml']); + $driver = new Definition('Doctrine\ORM\Mapping\Driver\XmlDriver', [$locator]); return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap); } @@ -81,9 +80,8 @@ public static function createXmlMappingDriver(array $namespaces, array $managerP */ public static function createYamlMappingDriver(array $namespaces, array $managerParameters = [], $enabledParameter = false, array $aliasMap = []) { - $arguments = [$namespaces, '.orm.yml']; - $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments); - $driver = new Definition('Doctrine\ORM\Mapping\Driver\YamlDriver', [$locator]); + $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', [$namespaces, '.orm.yml']); + $driver = new Definition('Doctrine\ORM\Mapping\Driver\YamlDriver', [$locator]); return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap); } @@ -103,9 +101,8 @@ public static function createYamlMappingDriver(array $namespaces, array $manager */ public static function createPhpMappingDriver(array $namespaces, array $managerParameters = [], $enabledParameter = false, array $aliasMap = []) { - $arguments = [$namespaces, '.php']; - $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments); - $driver = new Definition('Doctrine\Common\Persistence\Mapping\Driver\PHPDriver', [$locator]); + $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', [$namespaces, '.php']); + $driver = new Definition('Doctrine\Common\Persistence\Mapping\Driver\PHPDriver', [$locator]); return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap); }