Merge branch 'release/3.15.1'

acquia · Mar 10, 2022 · a22e6d9 · a22e6d9
2 parents 266668e + bd8109a
commit a22e6d9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/config/VERSION b/config/VERSION
@@ -1 +1 @@
-v3.15.0
+v3.15.1
diff --git a/config/packages.yml b/config/packages.yml
@@ -72,9 +72,10 @@ drupal/acsf: []
 drupal/acsf_sso:
   enable: false
 
-drupal/acquia_search:
-  version: 3.x
-  version_dev: 3.x-dev
+# @todo Temporarily remove drupal/acquia_search due to conflicts with drupal/acquia_cms.
+#drupal/acquia_search:
+#  version: 3.x
+#  version_dev: 3.x-dev
 
 acquia/blt:
   type: composer-plugin

diff --git a/src/Domain/Drush/DrushFacade.php b/src/Domain/Drush/DrushFacade.php
@@ -77,7 +77,11 @@ public function getDrushStatus(): array {
     $data = json_decode($json, TRUE);
 
     if (json_last_error()) {
-      throw new OrcaParseError('Invalid Drush output.');
+      throw new OrcaParseError(sprintf(
+        'Invalid Drush JSON output: (%s) %s',
+        json_last_error(),
+        json_last_error_msg()
+      ));
     }
 
     return $data;