Merge pull request #14626 from eileenmcnaughton/notice

[civicrm-core.git] / CRM / Upgrade / Headless.php

diff --git a/CRM/Upgrade/Headless.php b/CRM/Upgrade/Headless.php
index 31ccc3ae1c74bedc4913be22a49d7508d25187d6..397481a5726dd725c286e386c6a33eff5338973d 100644 (file)
--- a/CRM/Upgrade/Headless.php
+++ b/CRM/Upgrade/Headless.php
@@ -36,7 +36,8 @@ class CRM_Upgrade_Headless {
    * @param bool $enablePrint
    *
    * @throws Exception
-   * @return array, with keys:
+   * @return array
+   *   - with keys:
    *   - message: string, HTML-ish blob
    */
   public function run($enablePrint = TRUE) {
@@ -60,10 +61,10 @@ class CRM_Upgrade_Headless {
     $upgrade->setPreUpgradeMessage($preUpgradeMessage, $currentVer, $latestVer);
 
     $postUpgradeMessageFile = CRM_Utils_File::tempnam('civicrm-post-upgrade');
-    $queueRunner = new CRM_Queue_Runner(array(
+    $queueRunner = new CRM_Queue_Runner([
       'title' => ts('CiviCRM Upgrade Tasks'),
       'queue' => CRM_Upgrade_Form::buildQueue($currentVer, $latestVer, $postUpgradeMessageFile),
-    ));
+    ]);
     $queueResult = $queueRunner->runAll();
     if ($queueResult !== TRUE) {
       $errorMessage = CRM_Core_Error::formatTextException($queueResult['exception']);
@@ -71,17 +72,18 @@ class CRM_Upgrade_Headless {
       if ($enablePrint) {
         print ($errorMessage);
       }
-      throw $queueResult['exception']; // FIXME test
+      // FIXME test
+      throw $queueResult['exception'];
     }
 
     CRM_Upgrade_Form::doFinish();
 
     $message = file_get_contents($postUpgradeMessageFile);
-    return array(
+    return [
       'latestVer' => $latestVer,
       'message' => $message,
       'text' => CRM_Utils_String::htmlToText($message),
-    );
+    ];
   }
 
 }