Fix model_paths

propelorm · Feb 13, 2016 · d6d99be · d6d99be
1 parent 58b8062
commit d6d99be
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Command/FixturesLoadCommand.php b/Command/FixturesLoadCommand.php
@@ -168,7 +168,7 @@ protected function loadFixtures(InputInterface $input, OutputInterface $output,
             return -1;
         }
 
-        $connectionName = $input->getOption('connection');
+        $connectionName = $input->getOption('connection') ?: $this->getDefaultConnection();
 
         if ('yml' === $type) {
             $loader = $this->getContainer()->get('propel.loader.yaml');

diff --git a/DataFixtures/AbstractDataHandler.php b/DataFixtures/AbstractDataHandler.php
@@ -146,8 +146,8 @@ protected function getModelSearchPaths($connectionName)
     {
         $searchPath = array();
 
-        if (!empty($this->datasources[$connectionName]['connection']['model_paths'])) {
-            $modelPaths = $this->datasources[$connectionName]['connection']['model_paths'];
+        if (!empty($this->datasources['database']['connections'][$connectionName]['model_paths'])) {
+            $modelPaths = $this->datasources['database']['connections'][$connectionName]['model_paths'];
             foreach ($modelPaths as $modelPath) {
                 $searchPath[] = $this->getRootDir() . '/../' . $modelPath;
             }

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -158,6 +158,10 @@ protected function addDatabaseSection(ArrayNodeDefinition $node)
                                             ->booleanNode('ATTR_EMULATE_PREPARES')->defaultFalse()->end()
                                         ->end()
                                     ->end()
+                                    ->arrayNode('model_paths')
+                                        ->defaultValue(['src', 'vendor'])
+                                        ->prototype('scalar')->end()
+                                    ->end()
                                     ->arrayNode('settings')
                                     ->fixXmlConfig('query', 'queries')
                                         ->children()