ACMS-1890: Adding temp commit to test drs config override.

acquia · Jan 23, 2024 · 2357dfb · 2357dfb
1 parent 08d0764
commit 2357dfb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 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
@@ -22,8 +22,8 @@
  * settings.php, and we will not overwrite it.
  */
 // phpcs:ignore
-$drs_override_config_directories = !$drs_override_config_directories ?: TRUE;
-$drs_override_site_studio_sync_directories = !$drs_override_site_studio_sync_directories ?: TRUE;
+$drs_override_config_directories = !isset($drs_override_config_directories) ? TRUE : FALSE;
+$drs_override_site_studio_sync_directories = !isset($drs_override_site_studio_sync_directories) ? TRUE : FALSE;
 
 /**
  * Site path.

diff --git a/src/Robo/Commands/Blt/MigrateToDrsCommand.php b/src/Robo/Commands/Blt/MigrateToDrsCommand.php
@@ -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)) {