Merge pull request #13979 from totten/master-phpcbf-2

(NFC) Update various files to pass future civicrm/coder ruleset
civicrm · Apr 6, 2019 · b9e9e8d · b9e9e8d
2 parents 1060aa8 + 5d4fcf5
commit b9e9e8d
Show file tree

Hide file tree

Showing 65 changed files with 427 additions and 469 deletions.
diff --git a/CRM/ACL/Form/ACL.php b/CRM/ACL/Form/ACL.php
@@ -141,30 +141,30 @@ public function buildQuickForm() {
 
     $label = ts('Role');
     $role = [
-        '-1' => ts('- select role -'),
-        '0' => ts('Everyone'),
-      ] + CRM_Core_OptionGroup::values('acl_role');
+      '-1' => ts('- select role -'),
+      '0' => ts('Everyone'),
+    ] + CRM_Core_OptionGroup::values('acl_role');
     $this->add('select', 'entity_id', $label, $role, TRUE);
 
     $group = [
-        '-1' => ts('- select -'),
-        '0' => ts('All Groups'),
-      ] + CRM_Core_PseudoConstant::group();
+      '-1' => ts('- select -'),
+      '0' => ts('All Groups'),
+    ] + CRM_Core_PseudoConstant::group();
 
     $customGroup = [
-        '-1' => ts('- select -'),
-        '0' => ts('All Custom Groups'),
-      ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_CustomField', 'custom_group_id');
+      '-1' => ts('- select -'),
+      '0' => ts('All Custom Groups'),
+    ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_CustomField', 'custom_group_id');
 
     $ufGroup = [
-        '-1' => ts('- select -'),
-        '0' => ts('All Profiles'),
-      ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_UFField', 'uf_group_id');
+      '-1' => ts('- select -'),
+      '0' => ts('All Profiles'),
+    ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_UFField', 'uf_group_id');
 
     $event = [
-        '-1' => ts('- select -'),
-        '0' => ts('All Events'),
-      ] + CRM_Event_PseudoConstant::event(NULL, FALSE, "( is_template IS NULL OR is_template != 1 )");
+      '-1' => ts('- select -'),
+      '0' => ts('All Events'),
+    ] + CRM_Event_PseudoConstant::event(NULL, FALSE, "( is_template IS NULL OR is_template != 1 )");
 
     $this->add('select', 'group_id', ts('Group'), $group);
     $this->add('select', 'custom_group_id', ts('Custom Data'), $customGroup);

diff --git a/CRM/ACL/Form/ACLBasic.php b/CRM/ACL/Form/ACLBasic.php
@@ -80,9 +80,9 @@ public function buildQuickForm() {
 
     $label = ts('Role');
     $role = [
-        '-1' => ts('- select role -'),
-        '0' => ts('Everyone'),
-      ] + CRM_Core_OptionGroup::values('acl_role');
+      '-1' => ts('- select role -'),
+      '0' => ts('Everyone'),
+    ] + CRM_Core_OptionGroup::values('acl_role');
     $entityID = &$this->add('select', 'entity_id', $label, $role, TRUE);
 
     if ($this->_id) {

diff --git a/CRM/ACL/Page/ACL.php b/CRM/ACL/Page/ACL.php
@@ -123,22 +123,22 @@ public function browse() {
     $roles = CRM_Core_OptionGroup::values('acl_role');
 
     $group = [
-        '-1' => ts('- select -'),
-        '0' => ts('All Groups'),
-      ] + CRM_Core_PseudoConstant::group();
+      '-1' => ts('- select -'),
+      '0' => ts('All Groups'),
+    ] + CRM_Core_PseudoConstant::group();
     $customGroup = [
-        '-1' => ts('- select -'),
-        '0' => ts('All Custom Groups'),
-      ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_CustomField', 'custom_group_id');
+      '-1' => ts('- select -'),
+      '0' => ts('All Custom Groups'),
+    ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_CustomField', 'custom_group_id');
     $ufGroup = [
-        '-1' => ts('- select -'),
-        '0' => ts('All Profiles'),
-      ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_UFField', 'uf_group_id');
+      '-1' => ts('- select -'),
+      '0' => ts('All Profiles'),
+    ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_UFField', 'uf_group_id');
 
     $event = [
-        '-1' => ts('- select -'),
-        '0' => ts('All Events'),
-      ] + CRM_Event_PseudoConstant::event();
+      '-1' => ts('- select -'),
+      '0' => ts('All Events'),
+    ] + CRM_Event_PseudoConstant::event();
 
     while ($dao->fetch()) {
       $acl[$dao->id] = [];

diff --git a/CRM/Activity/ActionMapping.php b/CRM/Activity/ActionMapping.php
@@ -30,7 +30,6 @@
  * @copyright CiviCRM LLC (c) 2004-2019
  */
 
-use Civi\ActionSchedule\RecipientBuilder;
 
 /**
  * Class CRM_Activity_ActionMapping

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
@@ -1207,7 +1207,7 @@ public static function sendSMS(
     }
 
     if (!isset($contactDetails) && !isset($contactIds)) {
-      Throw new CRM_Core_Exception('You must specify either $contactDetails or $contactIds');
+      throw new CRM_Core_Exception('You must specify either $contactDetails or $contactIds');
     }
     // Populate $contactDetails and $contactIds if only one is set
     if (is_array($contactIds) && !empty($contactIds) && empty($contactDetails)) {
@@ -2403,9 +2403,9 @@ protected static function getActivityParamsForDashboardFunctions($params) {
     $enabledComponents = self::activityComponents();
     // @todo - should we move this to activity get api.
     foreach ([
-               'case_id' => 'CiviCase',
-               'campaign_id' => 'CiviCampaign',
-             ] as $attr => $component) {
+      'case_id' => 'CiviCase',
+      'campaign_id' => 'CiviCampaign',
+    ] as $attr => $component) {
       if (!in_array($component, $enabledComponents)) {
         $activityParams[$attr] = ['IS NULL' => 1];
       }

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
@@ -260,11 +260,7 @@ public function preProcess() {
       if (CRM_Contact_Form_Search::isSearchContext($this->_context)) {
         $this->_context = 'search';
       }
-      elseif (!in_array($this->_context, [
-          'dashlet',
-          'case',
-          'dashletFullscreen',
-        ])
+      elseif (!in_array($this->_context, ['dashlet', 'case', 'dashletFullscreen'])
         && $this->_currentlyViewedContactId
       ) {
         $this->_context = 'activity';

diff --git a/CRM/Activity/Form/ActivityView.php b/CRM/Activity/Form/ActivityView.php
@@ -130,7 +130,7 @@ public function buildQuickForm() {
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
           'isDefault' => TRUE,
         ],
-      ]
+    ]
     );
   }
 

diff --git a/CRM/Activity/Form/Task/FileOnCase.php b/CRM/Activity/Form/Task/FileOnCase.php
@@ -109,7 +109,8 @@ public function postProcess() {
         }
       }
       else {
-        CRM_Core_Session::setStatus(ts('Not permitted to file activity %1 %2.', [
+        CRM_Core_Session::setStatus(
+          ts('Not permitted to file activity %1 %2.', [
             1 => empty($defaults['subject']) ? '' : $defaults['subject'],
             2 => $defaults['activity_date_time'],
           ]),

diff --git a/CRM/Activity/Import/Form/MapField.php b/CRM/Activity/Import/Form/MapField.php
@@ -251,7 +251,7 @@ public function buildQuickForm() {
           'type' => 'cancel',
           'name' => ts('Cancel'),
         ],
-      ]
+    ]
     );
   }
 

diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php
@@ -240,30 +240,24 @@ public function run(
       }
       if ($this->_invalidRowCount) {
         // removed view url for invlaid contacts
-        $headers = array_merge([
-            ts('Line Number'),
-            ts('Reason'),
-          ],
+        $headers = array_merge(
+          [ts('Line Number'), ts('Reason')],
           $customHeaders
         );
         $this->_errorFileName = self::errorFileName(self::ERROR);
         self::exportCSV($this->_errorFileName, $headers, $this->_errors);
       }
       if ($this->_conflictCount) {
-        $headers = array_merge([
-            ts('Line Number'),
-            ts('Reason'),
-          ],
+        $headers = array_merge(
+          [ts('Line Number'), ts('Reason')],
           $customHeaders
         );
         $this->_conflictFileName = self::errorFileName(self::CONFLICT);
         self::exportCSV($this->_conflictFileName, $headers, $this->_conflicts);
       }
       if ($this->_duplicateCount) {
-        $headers = array_merge([
-            ts('Line Number'),
-            ts('View Activity History URL'),
-          ],
+        $headers = array_merge(
+          [ts('Line Number'), ts('View Activity History URL')],
           $customHeaders
         );
 

diff --git a/CRM/Activity/Tokens.php b/CRM/Activity/Tokens.php
@@ -78,7 +78,8 @@ public function alterActionScheduleQuery(\Civi\ActionSchedule\Event\MailingQuery
     // Q: Could we simplify & move the extra AND clauses into `where(...)`?
     $e->query->param('casEntityJoinExpr', 'e.id = reminder.entity_id AND e.is_current_revision = 1 AND e.is_deleted = 0');
 
-    $e->query->select('e.*'); // FIXME: seems too broad.
+    // FIXME: seems too broad.
+    $e->query->select('e.*');
     $e->query->select('ov.label as activity_type, e.id as activity_id');
 
     $e->query->join("og", "!casMailingJoinType civicrm_option_group og ON og.name = 'activity_type'");

diff --git a/CRM/Admin/Form.php b/CRM/Admin/Form.php
@@ -128,27 +128,25 @@ public function setDefaultValues() {
   public function buildQuickForm() {
     if ($this->_action & CRM_Core_Action::VIEW || $this->_action & CRM_Core_Action::PREVIEW) {
       $this->addButtons([
-          [
-            'type' => 'cancel',
-            'name' => ts('Done'),
-            'isDefault' => TRUE,
-          ],
-        ]
-      );
+        [
+          'type' => 'cancel',
+          'name' => ts('Done'),
+          'isDefault' => TRUE,
+        ],
+      ]);
     }
     else {
       $this->addButtons([
-          [
-            'type' => 'next',
-            'name' => $this->_action & CRM_Core_Action::DELETE ? ts('Delete') : ts('Save'),
-            'isDefault' => TRUE,
-          ],
-          [
-            'type' => 'cancel',
-            'name' => ts('Cancel'),
-          ],
-        ]
-      );
+        [
+          'type' => 'next',
+          'name' => $this->_action & CRM_Core_Action::DELETE ? ts('Delete') : ts('Save'),
+          'isDefault' => TRUE,
+        ],
+        [
+          'type' => 'cancel',
+          'name' => ts('Cancel'),
+        ],
+      ]);
     }
   }
 

diff --git a/CRM/Admin/Form/CMSUser.php b/CRM/Admin/Form/CMSUser.php
@@ -42,17 +42,16 @@ class CRM_Admin_Form_CMSUser extends CRM_Core_Form {
   public function buildQuickForm() {
 
     $this->addButtons([
-        [
-          'type' => 'next',
-          'name' => ts('OK'),
-          'isDefault' => TRUE,
-        ],
-        [
-          'type' => 'cancel',
-          'name' => ts('Cancel'),
-        ],
-      ]
-    );
+      [
+        'type' => 'next',
+        'name' => ts('OK'),
+        'isDefault' => TRUE,
+      ],
+      [
+        'type' => 'cancel',
+        'name' => ts('Cancel'),
+      ],
+    ]);
   }
 
   /**

diff --git a/CRM/Admin/Form/Extensions.php b/CRM/Admin/Form/Extensions.php
@@ -137,17 +137,16 @@ public function buildQuickForm() {
 
     $this->assign('title', $title);
     $this->addButtons([
-        [
-          'type' => 'next',
-          'name' => $buttonName,
-          'isDefault' => TRUE,
-        ],
-        [
-          'type' => 'cancel',
-          'name' => ts('Cancel'),
-        ],
-      ]
-    );
+      [
+        'type' => 'next',
+        'name' => $buttonName,
+        'isDefault' => TRUE,
+      ],
+      [
+        'type' => 'cancel',
+        'name' => ts('Cancel'),
+      ],
+    ]);
   }
 
   /**

diff --git a/CRM/Admin/Form/Generic.php b/CRM/Admin/Form/Generic.php
@@ -84,17 +84,16 @@ public function buildQuickForm() {
     // @todo - do we still like this redirect?
     CRM_Core_Session::singleton()->pushUserContext(CRM_Utils_System::url('civicrm/admin', 'reset=1'));
     $this->addButtons([
-        [
-          'type' => 'next',
-          'name' => ts('Save'),
-          'isDefault' => TRUE,
-        ],
-        [
-          'type' => 'cancel',
-          'name' => ts('Cancel'),
-        ],
-      ]
-    );
+      [
+        'type' => 'next',
+        'name' => ts('Save'),
+        'isDefault' => TRUE,
+      ],
+      [
+        'type' => 'cancel',
+        'name' => ts('Cancel'),
+      ],
+    ]);
   }
 
   /**

diff --git a/CRM/Admin/Form/Job.php b/CRM/Admin/Form/Job.php
@@ -78,9 +78,9 @@ public function buildQuickForm($check = FALSE) {
     );
 
     $this->addRule('name', ts('Name already exists in Database.'), 'objectExists', [
-        'CRM_Core_DAO_Job',
-        $this->_id,
-      ]);
+      'CRM_Core_DAO_Job',
+      $this->_id,
+    ]);
 
     $this->add('text', 'description', ts('Description'),
       $attributes['description']

diff --git a/CRM/Admin/Form/Mapping.php b/CRM/Admin/Form/Mapping.php
@@ -61,9 +61,9 @@ public function buildQuickForm() {
         CRM_Core_DAO::getAttribute('CRM_Core_DAO_Mapping', 'name'), TRUE
       );
       $this->addRule('name', ts('Name already exists in Database.'), 'objectExists', [
-          'CRM_Core_DAO_Mapping',
-          $this->_id,
-        ]);
+        'CRM_Core_DAO_Mapping',
+        $this->_id,
+      ]);
 
       $this->addElement('text', 'description', ts('Description'),
         CRM_Core_DAO::getAttribute('CRM_Core_DAO_Mapping', 'description')

diff --git a/CRM/Admin/Form/MessageTemplates.php b/CRM/Admin/Form/MessageTemplates.php
@@ -95,14 +95,13 @@ public function buildQuickForm() {
       $cancelURL = CRM_Utils_System::url('civicrm/admin/messageTemplates', 'selectedChild=workflow&reset=1');
       $cancelURL = str_replace('&amp;', '&', $cancelURL);
       $this->addButtons([
-          [
-            'type' => 'cancel',
-            'name' => ts('Done'),
-            'js' => ['onclick' => "location.href='{$cancelURL}'; return false;"],
-            'isDefault' => TRUE,
-          ],
-        ]
-      );
+        [
+          'type' => 'cancel',
+          'name' => ts('Done'),
+          'js' => ['onclick' => "location.href='{$cancelURL}'; return false;"],
+          'isDefault' => TRUE,
+        ],
+      ]);
     }
     else {
       $this->_workflow_id = CRM_Utils_Array::value('workflow_id', $this->_values);
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ @@
      * @copyright CiviCRM LLC (c) 2004-2019
      */
-    use Civi\ActionSchedule\RecipientBuilder;
     /**
      * Class CRM_Activity_ActionMapping
@@ Expand Down @@