From 22bbb9206c3341cd1592033cb41da5fe5778b74a Mon Sep 17 00:00:00 2001 From: Jesus Manuel Olivas Date: Tue, 17 Jan 2017 23:45:51 -0800 Subject: [PATCH] [init] Show config directories. (#134) --- src/Utils/ConfigurationManager.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Utils/ConfigurationManager.php b/src/Utils/ConfigurationManager.php index 76a09d5..445c015 100644 --- a/src/Utils/ConfigurationManager.php +++ b/src/Utils/ConfigurationManager.php @@ -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/'; } @@ -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 ) { @@ -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();