Skip to content

Commit

Permalink
[init] Show config directories. (#134)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmolivas committed Jan 18, 2017
1 parent 4bc30ba commit 22bbb92
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/Utils/ConfigurationManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public function loadConfiguration($applicationDirectory)
$configurationDirectories[] = '/etc/console/';
$configurationDirectories[] = $this->getHomeDirectory() . '/.console/';
$configurationDirectories[] = $applicationDirectory .'/console/';
$configurationDirectories[] = getcwd().'/console/';
if ($root) {
$configurationDirectories[] = $root . '/console/';
}
Expand All @@ -63,8 +62,7 @@ public function loadConfiguration($applicationDirectory)
foreach ($configurationDirectories as $configurationDirectory) {
$file = $configurationDirectory . 'config.yml';

if (is_dir($configurationDirectory)
&& stripos($configurationDirectory, '/vendor/') <= 0
if (stripos($configurationDirectory, '/vendor/') <= 0
&& stripos($configurationDirectory, '/bin/') <= 0
&& stripos($configurationDirectory, 'console/') > 0
) {
Expand All @@ -83,6 +81,9 @@ public function loadConfiguration($applicationDirectory)
$configurationFiles[] = $file;
}

$this->configurationDirectories =
array_unique($this->configurationDirectories);

$builder = new YamlFileConfigurationBuilder($configurationFiles);
$this->configuration = $builder->build();
$this->appendCommandAliases();
Expand Down

0 comments on commit 22bbb92

Please sign in to comment.