Merge pull request #922 from OskarStark/remove-otv

remove OTV
doctrine · Feb 25, 2019 · 98519bb · 98519bb
2 parents e68b3f8 + b50850e
commit 98519bb
Showing 1 changed file with 6 additions and 9 deletions.
diff --git 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);
     }