ACMS-1890: PR feedback for drs config override.

acquia · Mar 15, 2024 · d92b77d · d92b77d
1 parent 292e373
commit d92b77d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 91 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "composer-plugin-api": "^2.0",
         "composer-runtime-api": "^2.0",
         "acquia/drupal-environment-detector": "^1.5.3",
-        "acquia/drupal-recommended-settings": "dev-develop",
+        "acquia/drupal-recommended-settings": "dev-ACMS-3508",
         "consolidation/comments": "^1.0",
         "consolidation/config": "^2.0.0",
         "consolidation/robo": "^4",

diff --git a/composer.lock b/composer.lock
diff --git a/settings/config.settings.php b/settings/config.settings.php
diff --git a/src/Robo/Commands/Blt/MigrateToDrsCommand.php b/src/Robo/Commands/Blt/MigrateToDrsCommand.php
@@ -63,12 +63,12 @@ class MigrateToDrsCommand extends BltTasks {
   /**
    * Blt config override variable.
    */
-  private string $bltConfigOverrideVar = '$blt_override_config_directories';
+  private string $bltConfigOverrideVar = 'blt_override_config_directories';
 
   /**
    * Drs config override variable.
    */
-  private string $drsConfigOverrideVar = '$drs_override_config_directories';
+  private string $drsConfigOverrideVar = 'drs_override_config_directories';
 
   /**
    * Migrate BLT to use DRS.
@@ -114,7 +114,7 @@ private function processSettingsFile(string $site): void {
       "$sitePath/settings.php",
       "$sitePath/settings/local.settings.php",
       "$sitePath/settings/default.local.settings.php",
-    ]
+    ];
     $filesystem = new Filesystem();
     foreach ($relativePaths as $relativePath) {
       if ($filesystem->exists($relativePath)) {
@@ -132,17 +132,20 @@ private function processSettingsFile(string $site): void {
    */
   private function updateSettingsFile(string $settingFile): void {
     $fileContent = file_get_contents($settingFile);
+
+    // Check whether $blt_override_config_directories variable exists.
+    if (str_contains($fileContent, $this->bltConfigOverrideVar)) {
+      $fileContent = str_replace($this->bltConfigOverrideVar, $this->drsConfigOverrideVar, $fileContent);
+    }
     // Let remove BLT require section from settings.php.
-    $settingsFileContent = str_replace($this->bltSettingsWarning, '', $fileContent);
     if (substr_count($fileContent, $this->drsSettingsWarning) < 1) {
-      $settingsFileContent = str_replace($this->bltSettingsWarning, $this->drsSettingsWarning, $fileContent);
+      $fileContent = str_replace($this->bltSettingsWarning, $this->drsSettingsWarning, $fileContent);
     }
-    // Check whether $blt_override_config_directories variable exists.
-    if (substr_count($settingsFileContent, $this->bltConfigOverrideVar) < 1) {
-      $settingsFileContent = str_replace($this->bltConfigOverrideVar, $this->drsConfigOverrideVar, $settingsFileContent);
+    else {
+      $fileContent = str_replace($this->bltSettingsWarning, '', $fileContent);
     }
 
-    file_put_contents($settingFile, $settingsFileContent);
+    file_put_contents($settingFile, $fileContent);
   }
 
   /**