Add global basename support

example/full-config.php

@@ -63,6 +63,7 @@
                 'paths' => [],
                 'extension' => null,
                 'drivers' => [],
+                'global_basename' => null,
             ]
         ],
         'cache' => [

src/DriverFactory.php

@@ -55,22 +55,20 @@ protected function createWithConfig(ContainerInterface $container, $configKey)
                 ),
                 $config['paths']
             );
-        } else {
-            $driver = new $config['class']($config['paths']);
         }
 
-        if (null !== $config['extension'] && $driver instanceof FileDriver) {
-            $locator = $driver->getLocator();
+        if (null !== $config['extension']
+            && (FileDriver::class === $config['class'] || is_subclass_of($config['class'], FileDriver::class))
+        ) {
+            $driver = new $config['class']($config['paths'], $config['extension']);
+        }
 
-            if (get_class($locator) !== DefaultFileLocator::class) {
-                throw new Exception\DomainException(sprintf(
-                    'File locator must be a concrete instance of %s, got %s',
-                    DefaultFileLocator::class,
-                    get_class($locator)
-                ));
-            }
+        if (! isset($driver)) {
+            $driver = new $config['class']($config['paths']);
+        }
 
-            $driver->setLocator(new DefaultFileLocator($locator->getPaths(), $config['extension']));
+        if (array_key_exists('global_basename', $config) && $driver instanceof FileDriver) {
+            $driver->setGlobalBasename($config['global_basename']);
         }
 
         if ($driver instanceof MappingDriverChain) {

test/DriverFactoryTest.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * @license See the file LICENSE for copying permission
+ */
+
+namespace ContainerInteropDoctrineTest;
+
+use Doctrine\ORM\Mapping\Driver;
+use OutOfBoundsException;
+use ContainerInteropDoctrine\DriverFactory;
+use Interop\Container\ContainerInterface;
+use PHPUnit_Framework_TestCase as TestCase;
+
+class DriverFactoryTest extends TestCase
+{
+    public function testMissingClassKeyWillReturnOutOfBoundException()
+    {
+        $container = $this->prophesize(ContainerInterface::class);
+        $factory = new DriverFactory();
+
+        $this->setExpectedException(OutOfBoundsException::class, 'Missing "class" config key');
+
+        $factory($container->reveal());
+    }
+
+    public function testItSupportsGlobalBasenameOptionOnFileDrivers()
+    {
+        $globalBasename = 'foobar';
+
+        $container = $this->prophesize(ContainerInterface::class);
+        $container->has('config')->willReturn(true);
+        $container->get('config')->willReturn([
+            'doctrine' => [
+                'driver' => [
+                    'orm_default' => [
+                        'class' => TestAsset\StubFileDriver::class,
+                        'global_basename' => $globalBasename
+                    ],
+                ],
+            ],
+        ]);
+
+        $factory = new DriverFactory();
+
+        $driver = $factory($container->reveal());
+        $this->assertSame($globalBasename, $driver->getGlobalBasename());
+    }
+
+    /**
+     * @param string $driverClass
+     *
+     * @dataProvider simplifiedDriverClassProvider
+     */
+    public function testItSupportsSettingExtensionInDriversUsingSymfonyFileLocator($driverClass)
+    {
+        $extension = '.foo.bar';
+
+        $container = $this->prophesize(ContainerInterface::class);
+        $container->has('config')->willReturn(true);
+        $container->get('config')->willReturn([
+            'doctrine' => [
+                'driver' => [
+                    'orm_default' => [
+                        'class' => $driverClass,
+                        'extension' => $extension,
+                    ],
+                ],
+            ],
+        ]);
+
+        $factory = new DriverFactory();
+
+        /** @var Driver\SimplifiedXmlDriver $driver */
+        $driver = $factory($container->reveal());
+        $this->assertInstanceOf($driverClass, $driver);
+        $this->assertSame($extension, $driver->getLocator()->getFileExtension());
+    }
+
+    public function simplifiedDriverClassProvider()
+    {
+        return [
+            [ Driver\SimplifiedXmlDriver::class ],
+            [ Driver\SimplifiedYamlDriver::class ],
+        ];
+    }
+}

test/TestAsset/StubFileDriver.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * @license See the file LICENSE for copying permission
+ */
+
+namespace ContainerInteropDoctrineTest\TestAsset;
+
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+use Doctrine\Common\Persistence\Mapping\Driver\FileDriver;
+
+class StubFileDriver extends FileDriver
+{
+    protected function loadMappingFile($file)
+    {
+        return [];
+    }
+
+    public function loadMetadataForClass($className, ClassMetadata $metadata)
+    {
+    }
+}