diff --git a/composer.json b/composer.json index 7bde7f9..c782130 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "require": { "php": "^5.5.9 || ^7.0", "dflydev/dot-access-configuration": "^1.0", - "drupal/console-en": "1.8.0", + "drupal/console-en": "1.9.0", "stecman/symfony-console-completion": "~0.7", "symfony/config": "~2.8|~3.0", "symfony/console": "~2.8|~3.0", diff --git a/dist/chain/update-gitbook.yml b/dist/chain/update-gitbook.yml index c42185e..767f3da 100644 --- a/dist/chain/update-gitbook.yml +++ b/dist/chain/update-gitbook.yml @@ -17,7 +17,7 @@ commands: - views - features - command: 'develop:translation:sync' -{% set languages = ['en', 'ca', 'es', 'hi', 'hu', 'ja', 'mr', 'pt-br', 'ro', 'ru', 'vn' , 'zh-hans'] %} +{% set languages = ['en', 'ca', 'es', 'fr', 'hi', 'hu', 'ja', 'mr', 'pt-br', 'ro', 'ru', 'vn' , 'zh-hans'] %} {% for language in languages %} - command: settings:set arguments: diff --git a/src/Utils/ConfigurationManager.php b/src/Utils/ConfigurationManager.php index 1c52081..bd0a067 100644 --- a/src/Utils/ConfigurationManager.php +++ b/src/Utils/ConfigurationManager.php @@ -57,6 +57,7 @@ public function loadConfiguration($directory) true ); } + $input = new ArgvInput(); $root = $input->getParameterOption(['--root']); if ($root && is_dir($root)) { @@ -287,13 +288,31 @@ public function getConfigurationDirectories($includeVendorCore = false) return []; } + public function getConfigurationFile() + { + foreach (array_reverse($this->configurationDirectories) as $directory) { + $file = sprintf( + '%s/config.yml', + $directory + ); + + if (file_exists($file)) { + return $file; + } + } + + return null; + } + private function addConfigurationFilesByDirectory( $directory, $addDirectory = false ) { + if ($addDirectory) { $this->configurationDirectories[] = $directory; } + $configurationFiles = [ 'config' => 'config.yml', 'drush' => 'drush.yml', @@ -301,6 +320,7 @@ private function addConfigurationFilesByDirectory( 'mappings' => 'mappings.yml', 'defaults' => 'defaults.yml', ]; + foreach ($configurationFiles as $key => $file) { $configFile = $directory.$file; if (is_file($configFile)) {