Added configurable naming strategy

Supericy · Dec 22, 2014 · 8b351f7 · 8b351f7 · kirkbushell · Jan 26, 2015
1 parent 34417df
commit 8b351f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/config/doctrine.php b/config/doctrine.php
@@ -4,7 +4,8 @@
     'simple_annotations' => false,
 
     'metadata' => [
-        base_path('app/models')
+        'paths' => [base_path('app/models')],
+        'naming_strategy' => null
     ],
 
     'proxy' => [

diff --git a/src/LaravelDoctrineServiceProvider.php b/src/LaravelDoctrineServiceProvider.php
@@ -81,7 +81,7 @@ private function registerEntityManager()
         $this->app->singleton(EntityManager::class, function ($app) {
             $config = $app['config']['doctrine::doctrine'];
             $metadata = Setup::createAnnotationMetadataConfiguration(
-                $config['metadata'],
+                $config['metadata']['paths'],
                 $app['config']['app.debug'],
                 $config['proxy']['directory'],
                 $app[CacheManager::class]->getCache($config['cache_provider']),
@@ -92,6 +92,9 @@ private function registerEntityManager()
             $metadata->setDefaultRepositoryClassName($config['repository']);
             $metadata->setSQLLogger($config['logger']);
 
+            if (isset($config['metadata']['naming_strategy']))
+                $metadata->setNamingStrategy($app->make($config['metadata']['naming_strategy']));
+
             if (isset($config['proxy']['namespace']))
                 $metadata->setProxyNamespace($config['proxy']['namespace']);