Merge pull request #15410 from herbdool/cloud-21

[civicrm-core.git] / Civi / Angular / Page / Modules.php

diff --git a/Civi/Angular/Page/Modules.php b/Civi/Angular/Page/Modules.php
index 663a8f6ea149fc0d70e05697189c243f36ad09bc..aa3655b8c7ab2e96f675e88b4e9e66d3c2db1652 100644 (file)
--- a/Civi/Angular/Page/Modules.php
+++ b/Civi/Angular/Page/Modules.php
@@ -24,6 +24,8 @@ class Modules extends \CRM_Core_Page {
    * "civicrm/ajax/anulgar-modules" route).
    *
    * @deprecated
+   *
+   * @throws \CRM_Core_Exception
    */
   public function run() {
     /**
@@ -56,7 +58,7 @@ class Modules extends \CRM_Core_Page {
         break;
 
       default:
-        \CRM_Core_Error::fatal("Unrecognized format");
+        throw new \CRM_Core_Exception("Unrecognized format");
     }
 
     \CRM_Utils_System::civiExit();
@@ -102,14 +104,14 @@ class Modules extends \CRM_Core_Page {
    * @return string
    */
   public function digestJs($files) {
-    $scripts = array();
+    $scripts = [];
     foreach ($files as $file) {
       $scripts[] = file_get_contents($file);
     }
     $scripts = \CRM_Utils_JS::dedupeClosures(
       $scripts,
-      array('angular', '$', '_'),
-      array('angular', 'CRM.$', 'CRM._')
+      ['angular', '$', '_'],
+      ['angular', 'CRM.$', 'CRM._']
     );
     // This impl of stripComments currently adds 10-20ms and cuts ~7%
     return \CRM_Utils_JS::stripComments(implode("\n", $scripts));
@@ -144,10 +146,10 @@ class Modules extends \CRM_Core_Page {
    */
   public function getMetadata($moduleNames, $angular) {
     $modules = $angular->getModules();
-    $result = array();
+    $result = [];
     foreach ($moduleNames as $moduleName) {
       if (isset($modules[$moduleName])) {
-        $result[$moduleName] = array();
+        $result[$moduleName] = [];
         $result[$moduleName]['domain'] = $modules[$moduleName]['ext'];
         $result[$moduleName]['js'] = $angular->getResources($moduleName, 'js', 'rawUrl');
         $result[$moduleName]['css'] = $angular->getResources($moduleName, 'css', 'rawUrl');