diff --git a/Command/FixturesLoadCommand.php b/Command/FixturesLoadCommand.php index 9e4ec1b..fddb934 100644 --- a/Command/FixturesLoadCommand.php +++ b/Command/FixturesLoadCommand.php @@ -168,7 +168,7 @@ EOT 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 index 025cb12..36697e0 100644 --- a/DataFixtures/AbstractDataHandler.php +++ b/DataFixtures/AbstractDataHandler.php @@ -146,8 +146,8 @@ abstract class AbstractDataHandler { $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 index 88ecb22..0d89dd2 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -158,6 +158,10 @@ class Configuration extends PropelConfiguration ->booleanNode('ATTR_EMULATE_PREPARES')->defaultFalse()->end() ->end() ->end() + ->arrayNode('model_paths') + ->defaultValue(['src', 'vendor']) + ->prototype('scalar')->end() + ->end() ->arrayNode('settings') ->fixXmlConfig('query', 'queries') ->children()