Dynamically add fluent mapping files on runtime (#204)

laravel-doctrine · Jan 29, 2017 · 958f91c · 958f91c
1 parent 4c96515
commit 958f91c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/src/Configuration/MetaData/Fluent.php b/src/Configuration/MetaData/Fluent.php
@@ -32,7 +32,7 @@ public function __construct(Container $container)
      */
     public function resolve(array $settings = [])
     {
-        $driver         = new FluentDriver(array_get($settings, 'mappings'));
+        $driver         = new FluentDriver(array_get($settings, 'mappings', []));
 
         $namingStrategy = $this->getNamingStrategy($settings);
 

diff --git a/src/DoctrineManager.php b/src/DoctrineManager.php
@@ -113,6 +113,17 @@ public function addPaths(array $paths = [], $connection = null)
         });
     }
 
+    /**
+     * @param array       $mappings
+     * @param string|null $connection
+     */
+    public function addMappings(array $mappings = [], $connection = null)
+    {
+        $this->onResolve(function (ManagerRegistry $registry) use ($connection, $mappings) {
+            $this->getMetaDataDriver($connection, $registry)->addMappings($mappings);
+        });
+    }
+
     /**
      * @param null $connection
      *

diff --git a/src/Extensions/MappingDriverChain.php b/src/Extensions/MappingDriverChain.php
@@ -6,7 +6,6 @@
 use Doctrine\Common\Persistence\Mapping\Driver\FileDriver;
 use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain as DoctrineMappingDriverChain;
-use Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver;
 use Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 
@@ -37,7 +36,7 @@ public function addPaths(array $paths = [])
     {
         $driver = $this->getDefaultDriver();
 
-        if ($driver instanceof AnnotationDriver || $driver instanceof StaticPHPDriver) {
+        if (method_exists($driver, 'addPaths')) {
             $driver->addPaths($paths);
         } elseif ($driver instanceof FileDriver) {
             if ($driver->getLocator() instanceof DefaultFileLocator) {
@@ -48,6 +47,18 @@ public function addPaths(array $paths = [])
         }
     }
 
+    /**
+     * @param array $mappings
+     */
+    public function addMappings(array $mappings = [])
+    {
+        $driver = $this->getDefaultDriver();
+
+        if (method_exists($driver, 'addMappings')) {
+            $driver->addMappings($mappings);
+        }
+    }
+
     /**
      * @return \Doctrine\Common\Annotations\Reader|null
      */

diff --git a/tests/Stubs/storage/.gitignore b/tests/Stubs/storage/.gitignore
@@ -0,0 +1,3 @@
+*
+!.gitignore
+!views/.gitignore
diff --git a/tests/Stubs/storage/framework/views/.gitkeep b/tests/Stubs/storage/framework/views/.gitkeep