From 617697e8eaa43ad56084c3fcc2b7bdf01854d6f1 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 28 Mar 2019 21:14:10 -0400 Subject: [PATCH] NFC - Short array syntax - auto-convert ang dir --- ang/angularFileUpload.ang.php | 6 +++--- ang/crmApp.ang.php | 6 +++--- ang/crmAttachment.ang.php | 16 ++++++++-------- ang/crmAutosave.ang.php | 8 ++++---- ang/crmCaseType.ang.php | 20 ++++++++++---------- ang/crmCxn.ang.php | 12 ++++++------ ang/crmD3.ang.php | 10 +++++----- ang/crmExample.ang.php | 10 +++++----- ang/crmMailing.ang.php | 14 +++++++------- ang/crmMailingAB.ang.php | 14 +++++++------- ang/crmResource.ang.php | 6 +++--- ang/crmRouteBinder.ang.php | 12 ++++++------ ang/crmStatusPage.ang.php | 14 +++++++------- ang/crmUi.ang.php | 12 ++++++------ ang/crmUtil.ang.php | 8 ++++---- ang/dialogService.ang.php | 6 +++--- ang/ngRoute.ang.php | 6 +++--- ang/ngSanitize.ang.php | 6 +++--- ang/ui.bootstrap.ang.php | 10 +++++----- ang/ui.sortable.ang.php | 6 +++--- ang/ui.utils.ang.php | 6 +++--- ang/unsavedChanges.ang.php | 6 +++--- 22 files changed, 107 insertions(+), 107 deletions(-) diff --git a/ang/angularFileUpload.ang.php b/ang/angularFileUpload.ang.php index b8c99761a1..68f4aa99aa 100644 --- a/ang/angularFileUpload.ang.php +++ b/ang/angularFileUpload.ang.php @@ -3,7 +3,7 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('bower_components/angular-file-upload/angular-file-upload.min.js'), -); + 'js' => ['bower_components/angular-file-upload/angular-file-upload.min.js'], +]; diff --git a/ang/crmApp.ang.php b/ang/crmApp.ang.php index 5139e80a54..d4179315bd 100644 --- a/ang/crmApp.ang.php +++ b/ang/crmApp.ang.php @@ -3,7 +3,7 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('ang/crmApp.js'), -); + 'js' => ['ang/crmApp.js'], +]; diff --git a/ang/crmAttachment.ang.php b/ang/crmAttachment.ang.php index a47f08d01f..e278f75e32 100644 --- a/ang/crmAttachment.ang.php +++ b/ang/crmAttachment.ang.php @@ -3,13 +3,13 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('ang/crmAttachment.js'), - 'css' => array('ang/crmAttachment.css'), - 'partials' => array('ang/crmAttachment'), - 'settings' => array( + 'js' => ['ang/crmAttachment.js'], + 'css' => ['ang/crmAttachment.css'], + 'partials' => ['ang/crmAttachment'], + 'settings' => [ 'token' => \CRM_Core_Page_AJAX_Attachment::createToken(), - ), - 'requires' => array('angularFileUpload', 'crmResource'), -); + ], + 'requires' => ['angularFileUpload', 'crmResource'], +]; diff --git a/ang/crmAutosave.ang.php b/ang/crmAutosave.ang.php index 4754eafd11..6f998782c7 100644 --- a/ang/crmAutosave.ang.php +++ b/ang/crmAutosave.ang.php @@ -3,8 +3,8 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('ang/crmAutosave.js'), - 'requires' => array('crmUtil'), -); + 'js' => ['ang/crmAutosave.js'], + 'requires' => ['crmUtil'], +]; diff --git a/ang/crmCaseType.ang.php b/ang/crmCaseType.ang.php index 32a2271ab4..21596810d4 100644 --- a/ang/crmCaseType.ang.php +++ b/ang/crmCaseType.ang.php @@ -5,16 +5,16 @@ // ODDITY: This only loads if CiviCase is active. -CRM_Core_Resources::singleton()->addSetting(array( - 'crmCaseType' => array( +CRM_Core_Resources::singleton()->addSetting([ + 'crmCaseType' => [ 'REL_TYPE_CNAME' => CRM_Case_XMLProcessor::REL_TYPE_CNAME, - ), -)); + ], +]); -return array( +return [ 'ext' => 'civicrm', - 'js' => array('ang/crmCaseType.js'), - 'css' => array('ang/crmCaseType.css'), - 'partials' => array('ang/crmCaseType'), - 'requires' => array('ngRoute', 'ui.utils', 'crmUi', 'unsavedChanges', 'crmUtil', 'crmResource'), -); + 'js' => ['ang/crmCaseType.js'], + 'css' => ['ang/crmCaseType.css'], + 'partials' => ['ang/crmCaseType'], + 'requires' => ['ngRoute', 'ui.utils', 'crmUi', 'unsavedChanges', 'crmUtil', 'crmResource'], +]; diff --git a/ang/crmCxn.ang.php b/ang/crmCxn.ang.php index c33a6a5584..ff267991f8 100644 --- a/ang/crmCxn.ang.php +++ b/ang/crmCxn.ang.php @@ -3,10 +3,10 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('ang/crmCxn.js', 'ang/crmCxn/*.js'), - 'css' => array('ang/crmCxn.css'), - 'partials' => array('ang/crmCxn'), - 'requires' => array('crmUtil', 'ngRoute', 'ngSanitize', 'ui.utils', 'crmUi', 'dialogService', 'crmResource'), -); + 'js' => ['ang/crmCxn.js', 'ang/crmCxn/*.js'], + 'css' => ['ang/crmCxn.css'], + 'partials' => ['ang/crmCxn'], + 'requires' => ['crmUtil', 'ngRoute', 'ngSanitize', 'ui.utils', 'crmUi', 'dialogService', 'crmResource'], +]; diff --git a/ang/crmD3.ang.php b/ang/crmD3.ang.php index eee0ebd661..0a737341ae 100644 --- a/ang/crmD3.ang.php +++ b/ang/crmD3.ang.php @@ -6,11 +6,11 @@ // ODDITY: Only loads if you have CiviMail permissions. // ODDITY: Extra resources loaded via CRM_Mailing_Info::getAngularModules. -return array( +return [ 'ext' => 'civicrm', - 'js' => array( + 'js' => [ 'ang/crmD3.js', 'bower_components/d3/d3.min.js', - ), - 'requires' => array(), -); + ], + 'requires' => [], +]; diff --git a/ang/crmExample.ang.php b/ang/crmExample.ang.php index 0868055b17..763f1eaca2 100644 --- a/ang/crmExample.ang.php +++ b/ang/crmExample.ang.php @@ -3,9 +3,9 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('ang/crmExample.js'), - 'partials' => array('ang/crmExample'), - 'requires' => array('crmUtil', 'ngRoute', 'ui.utils', 'crmUi', 'crmResource'), -); + 'js' => ['ang/crmExample.js'], + 'partials' => ['ang/crmExample'], + 'requires' => ['crmUtil', 'ngRoute', 'ui.utils', 'crmUi', 'crmResource'], +]; diff --git a/ang/crmMailing.ang.php b/ang/crmMailing.ang.php index 099c377cde..a3e140c605 100644 --- a/ang/crmMailing.ang.php +++ b/ang/crmMailing.ang.php @@ -6,13 +6,13 @@ // ODDITY: Only loads if you have CiviMail permissions. // ODDITY: Extra resources loaded via CRM_Mailing_Info::getAngularModules. -return array( +return [ 'ext' => 'civicrm', - 'js' => array( + 'js' => [ 'ang/crmMailing.js', 'ang/crmMailing/*.js', - ), - 'css' => array('ang/crmMailing.css'), - 'partials' => array('ang/crmMailing'), - 'requires' => array('crmUtil', 'crmAttachment', 'crmAutosave', 'ngRoute', 'ui.utils', 'crmUi', 'dialogService', 'crmResource'), -); + ], + 'css' => ['ang/crmMailing.css'], + 'partials' => ['ang/crmMailing'], + 'requires' => ['crmUtil', 'crmAttachment', 'crmAutosave', 'ngRoute', 'ui.utils', 'crmUi', 'dialogService', 'crmResource'], +]; diff --git a/ang/crmMailingAB.ang.php b/ang/crmMailingAB.ang.php index 75e918bc8e..6741399ebc 100644 --- a/ang/crmMailingAB.ang.php +++ b/ang/crmMailingAB.ang.php @@ -6,14 +6,14 @@ // ODDITY: Only loads if you have CiviMail permissions. // ODDITY: Extra resources loaded via CRM_Mailing_Info::getAngularModules. -return array( +return [ 'ext' => 'civicrm', - 'js' => array( + 'js' => [ 'ang/crmMailingAB.js', 'ang/crmMailingAB/*.js', 'ang/crmMailingAB/*/*.js', - ), - 'css' => array('ang/crmMailingAB.css'), - 'partials' => array('ang/crmMailingAB'), - 'requires' => array('ngRoute', 'ui.utils', 'crmUi', 'crmAttachment', 'crmMailing', 'crmD3', 'crmResource'), -); + ], + 'css' => ['ang/crmMailingAB.css'], + 'partials' => ['ang/crmMailingAB'], + 'requires' => ['ngRoute', 'ui.utils', 'crmUi', 'crmAttachment', 'crmMailing', 'crmD3', 'crmResource'], +]; diff --git a/ang/crmResource.ang.php b/ang/crmResource.ang.php index f63cc54c54..eaa504f30c 100644 --- a/ang/crmResource.ang.php +++ b/ang/crmResource.ang.php @@ -3,8 +3,8 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', // 'js' => array('js/angular-crmResource/byModule.js'), // One HTTP request per module. - 'js' => array('js/angular-crmResource/all.js'), // One HTTP request for all modules. -); + 'js' => ['js/angular-crmResource/all.js'], // One HTTP request for all modules. +]; diff --git a/ang/crmRouteBinder.ang.php b/ang/crmRouteBinder.ang.php index f19e336b09..0da8aa36f7 100644 --- a/ang/crmRouteBinder.ang.php +++ b/ang/crmRouteBinder.ang.php @@ -3,10 +3,10 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('ang/crmRouteBinder.js'), - 'css' => array(), - 'partials' => array(), - 'requires' => array('ngRoute'), -); + 'js' => ['ang/crmRouteBinder.js'], + 'css' => [], + 'partials' => [], + 'requires' => ['ngRoute'], +]; diff --git a/ang/crmStatusPage.ang.php b/ang/crmStatusPage.ang.php index c637199918..c72127f3dc 100644 --- a/ang/crmStatusPage.ang.php +++ b/ang/crmStatusPage.ang.php @@ -5,11 +5,11 @@ // ODDITY: Angular name 'statuspage' doesn't match the file name 'crmStatusPage'. -return array( +return [ 'ext' => 'civicrm', - 'js' => array('ang/crmStatusPage.js', 'ang/crmStatusPage/*.js'), - 'css' => array('ang/crmStatusPage.css'), - 'partials' => array('ang/crmStatusPage'), - 'settings' => array(), - 'requires' => array('crmUi', 'crmUtil', 'ngRoute', 'crmResource'), -); + 'js' => ['ang/crmStatusPage.js', 'ang/crmStatusPage/*.js'], + 'css' => ['ang/crmStatusPage.css'], + 'partials' => ['ang/crmStatusPage'], + 'settings' => [], + 'requires' => ['crmUi', 'crmUtil', 'ngRoute', 'crmResource'], +]; diff --git a/ang/crmUi.ang.php b/ang/crmUi.ang.php index 1e4306d32b..72c6594aeb 100644 --- a/ang/crmUi.ang.php +++ b/ang/crmUi.ang.php @@ -3,12 +3,12 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('ang/crmUi.js'), - 'partials' => array('ang/crmUi'), - 'requires' => array( + 'js' => ['ang/crmUi.js'], + 'partials' => ['ang/crmUi'], + 'requires' => [ 'crmResource', 'ui.utils', - ), -); + ], +]; diff --git a/ang/crmUtil.ang.php b/ang/crmUtil.ang.php index bea2c48c0c..78ca548c49 100644 --- a/ang/crmUtil.ang.php +++ b/ang/crmUtil.ang.php @@ -3,8 +3,8 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('ang/crmUtil.js'), - 'requires' => array(), -); + 'js' => ['ang/crmUtil.js'], + 'requires' => [], +]; diff --git a/ang/dialogService.ang.php b/ang/dialogService.ang.php index afeb6c98f2..31a9a8ace1 100644 --- a/ang/dialogService.ang.php +++ b/ang/dialogService.ang.php @@ -5,7 +5,7 @@ // https://github.com/jwstadler/angular-jquery-dialog-service -return array( +return [ 'ext' => 'civicrm', - 'js' => array('bower_components/angular-jquery-dialog-service/dialog-service.js'), -); + 'js' => ['bower_components/angular-jquery-dialog-service/dialog-service.js'], +]; diff --git a/ang/ngRoute.ang.php b/ang/ngRoute.ang.php index 96fea4591e..11c6d868a2 100644 --- a/ang/ngRoute.ang.php +++ b/ang/ngRoute.ang.php @@ -3,7 +3,7 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('bower_components/angular-route/angular-route.min.js'), -); + 'js' => ['bower_components/angular-route/angular-route.min.js'], +]; diff --git a/ang/ngSanitize.ang.php b/ang/ngSanitize.ang.php index 8de9a66a39..36329e5571 100644 --- a/ang/ngSanitize.ang.php +++ b/ang/ngSanitize.ang.php @@ -3,7 +3,7 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('bower_components/angular-sanitize/angular-sanitize.min.js'), -); + 'js' => ['bower_components/angular-sanitize/angular-sanitize.min.js'], +]; diff --git a/ang/ui.bootstrap.ang.php b/ang/ui.bootstrap.ang.php index 51e727cb75..417d7bf66d 100644 --- a/ang/ui.bootstrap.ang.php +++ b/ang/ui.bootstrap.ang.php @@ -3,9 +3,9 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'basePages' => array(), - 'js' => array('bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js'), - 'css' => array('bower_components/angular-bootstrap/ui-bootstrap-csp.css', 'ang/ui.bootstrap.css'), -); + 'basePages' => [], + 'js' => ['bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js'], + 'css' => ['bower_components/angular-bootstrap/ui-bootstrap-csp.css', 'ang/ui.bootstrap.css'], +]; diff --git a/ang/ui.sortable.ang.php b/ang/ui.sortable.ang.php index 818f091014..9679e6e659 100644 --- a/ang/ui.sortable.ang.php +++ b/ang/ui.sortable.ang.php @@ -3,7 +3,7 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('bower_components/angular-ui-sortable/sortable.min.js'), -); + 'js' => ['bower_components/angular-ui-sortable/sortable.min.js'], +]; diff --git a/ang/ui.utils.ang.php b/ang/ui.utils.ang.php index ab74e45b98..58b798a442 100644 --- a/ang/ui.utils.ang.php +++ b/ang/ui.utils.ang.php @@ -3,7 +3,7 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('bower_components/angular-ui-utils/ui-utils.min.js'), -); + 'js' => ['bower_components/angular-ui-utils/ui-utils.min.js'], +]; diff --git a/ang/unsavedChanges.ang.php b/ang/unsavedChanges.ang.php index 3a862fcd28..f8822cd245 100644 --- a/ang/unsavedChanges.ang.php +++ b/ang/unsavedChanges.ang.php @@ -3,7 +3,7 @@ // in CiviCRM. See also: // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules -return array( +return [ 'ext' => 'civicrm', - 'js' => array('bower_components/angular-unsavedChanges/dist/unsavedChanges.min.js'), -); + 'js' => ['bower_components/angular-unsavedChanges/dist/unsavedChanges.min.js'], +]; -- 2.25.1