[Settings:set] update to check first config available stating in curr…

…ent site first, added french to documentation
hechoendrupal · May 9, 2018 · c62582c · c62582c
1 parent eb59489
commit c62582c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git 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/Command/Settings/SetCommand.php b/src/Command/Settings/SetCommand.php
@@ -82,24 +82,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $settingName = $input->getArgument('name');
         $settingValue = $input->getArgument('value');
 
-        $userConfigFile = sprintf(
-            '%s/.console/config.yml',
-            $this->configurationManager->getHomeDirectory()
-        );
+        // get configuration file
+        $configFile = $this->configurationManager->getConfigurationFile();
 
-        if (!file_exists($userConfigFile)) {
+        if (!file_exists($configFile)) {
             $this->getIo()->error(
                 sprintf(
                     $this->trans('commands.settings.set.messages.missing-file'),
-                    $userConfigFile
+                    $configFile
                 )
             );
             return 1;
         }
 
         try {
             $userConfigFileParsed = $parser->parse(
-                file_get_contents($userConfigFile)
+                file_get_contents($configFile)
             );
         } catch (\Exception $e) {
             $this->getIo()->error(
@@ -151,7 +149,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         try {
-            file_put_contents($userConfigFile, $userConfigFileDump);
+            file_put_contents($configFile, $userConfigFileDump);
         } catch (\Exception $e) {
             $this->getIo()->error(
                 [

diff --git a/src/Utils/ConfigurationManager.php b/src/Utils/ConfigurationManager.php
@@ -54,6 +54,7 @@ public function loadConfiguration($directory)
                 true
             );
         }
+
         $input = new ArgvInput();
         $root = $input->getParameterOption(['--root']);
         if ($root && is_dir($root)) {
@@ -285,20 +286,39 @@ 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',
             'aliases' => 'aliases.yml',
             'mappings' => 'mappings.yml',
             'defaults' => 'defaults.yml',
         ];
+
         foreach ($configurationFiles as $key => $file) {
             $configFile = $directory.$file;
             if (is_file($configFile)) {