From 006389dea781a2d5ec2ce5f93a9ee1617673334c Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Mon, 19 Jan 2015 20:28:23 -0800 Subject: [PATCH] INFRA-132 - Drupal.WhiteSpace.ScopeIndent.Incorrect --- CRM/Campaign/Form/Campaign.php | 19 ++++++------------- CRM/Contact/BAO/GroupContact.php | 10 ++-------- CRM/Contact/Page/View.php | 6 ++---- CRM/Contribute/Form/AdditionalPayment.php | 10 +++++----- CRM/Contribute/Form/Contribution.php | 7 ++----- CRM/Contribute/Form/Contribution/Main.php | 2 +- CRM/Contribute/Form/SearchContribution.php | 2 +- CRM/Contribute/Import/Parser.php | 2 +- CRM/Contribute/PseudoConstant.php | 4 ++-- CRM/Contribute/Selector/Search.php | 3 +-- CRM/Core/BAO/ActionSchedule.php | 2 +- CRM/Core/BAO/Address.php | 2 -- CRM/Core/BAO/Cache.php | 16 ++++++++-------- CRM/Core/IDS.php | 2 +- CRM/Event/Form/ManageEvent/Registration.php | 14 ++++---------- CRM/Event/Form/Participant.php | 7 ++----- CRM/Financial/BAO/FinancialType.php | 2 +- CRM/Financial/BAO/PaymentProcessor.php | 2 +- CRM/Financial/BAO/PaymentProcessorType.php | 6 +++--- CRM/Financial/Form/BatchTransaction.php | 2 +- CRM/Financial/Form/FinancialType.php | 2 +- CRM/Financial/Page/BatchTransaction.php | 2 +- CRM/Financial/Page/FinancialType.php | 2 +- CRM/Grant/Form/Search.php | 2 +- CRM/Mailing/BAO/Mailing.php | 8 ++++---- CRM/Mailing/Event/BAO/Forward.php | 2 +- CRM/Mailing/Event/BAO/Resubscribe.php | 6 +++--- CRM/Member/Form/Membership.php | 8 ++------ 28 files changed, 59 insertions(+), 93 deletions(-) diff --git a/CRM/Campaign/Form/Campaign.php b/CRM/Campaign/Form/Campaign.php index 7517ce70cb..c80c7b7b06 100644 --- a/CRM/Campaign/Form/Campaign.php +++ b/CRM/Campaign/Form/Campaign.php @@ -145,24 +145,17 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form { } if (isset($defaults['start_date'])) { - list($defaults['start_date'], - $defaults['start_date_time'] - ) = CRM_Utils_Date::setDateDefaults($defaults['start_date'], - 'activityDateTime' - ); + list($defaults['start_date'], $defaults['start_date_time']) + = CRM_Utils_Date::setDateDefaults($defaults['start_date'], 'activityDateTime'); } else { - list($defaults['start_date'], - $defaults['start_date_time'] - ) = CRM_Utils_Date::setDateDefaults(); + list($defaults['start_date'], $defaults['start_date_time']) + = CRM_Utils_Date::setDateDefaults(); } if (isset($defaults['end_date'])) { - list($defaults['end_date'], - $defaults['end_date_time'] - ) = CRM_Utils_Date::setDateDefaults($defaults['end_date'], - 'activityDateTime' - ); + list($defaults['end_date'], $defaults['end_date_time']) + = CRM_Utils_Date::setDateDefaults($defaults['end_date'], 'activityDateTime'); } if (!isset($defaults['is_active'])) { diff --git a/CRM/Contact/BAO/GroupContact.php b/CRM/Contact/BAO/GroupContact.php index 936bc0cba3..8616165c39 100644 --- a/CRM/Contact/BAO/GroupContact.php +++ b/CRM/Contact/BAO/GroupContact.php @@ -139,14 +139,8 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { CRM_Utils_Hook::pre('create', 'GroupContact', $groupId, $contactIds); - list($numContactsAdded, - $numContactsNotAdded - ) = self::bulkAddContactsToGroup($contactIds, - $groupId, - $method, - $status, - $tracking - ); + list($numContactsAdded, $numContactsNotAdded) + = self::bulkAddContactsToGroup($contactIds, $groupId, $method, $status, $tracking); // also reset the acl cache $config = CRM_Core_Config::singleton(); diff --git a/CRM/Contact/Page/View.php b/CRM/Contact/Page/View.php index 68d24a9a70..fcd335de87 100644 --- a/CRM/Contact/Page/View.php +++ b/CRM/Contact/Page/View.php @@ -180,9 +180,7 @@ class CRM_Contact_Page_View extends CRM_Core_Page { // check logged in user permission self::checkUserPermission($this); - list($displayName, $contactImage, - $contactType, $contactSubtype, $contactImageUrl - ) = self::getContactDetails($this->_contactId); + list($displayName, $contactImage, $contactType, $contactSubtype, $contactImageUrl) = self::getContactDetails($this->_contactId); $this->assign('displayName', $displayName); $this->set('contactType', $contactType); @@ -268,7 +266,7 @@ class CRM_Contact_Page_View extends CRM_Core_Page { ) = CRM_Contact_BAO_Contact::getDisplayAndImage($contactId, TRUE, TRUE - ); + ); } /** diff --git a/CRM/Contribute/Form/AdditionalPayment.php b/CRM/Contribute/Form/AdditionalPayment.php index 0907be076b..61101dac20 100644 --- a/CRM/Contribute/Form/AdditionalPayment.php +++ b/CRM/Contribute/Form/AdditionalPayment.php @@ -182,11 +182,11 @@ class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_Abstract } if (empty($defaults['trxn_date']) && empty($defaults['trxn_date_time'])) { - list($defaults['trxn_date'], - $defaults['trxn_date_time'] - ) = CRM_Utils_Date::setDateDefaults( - CRM_Utils_Array::value('register_date', $defaults), 'activityDateTime' - ); + list($defaults['trxn_date'], $defaults['trxn_date_time']) + = CRM_Utils_Date::setDateDefaults( + CRM_Utils_Array::value('register_date', $defaults), + 'activityDateTime' + ); } if ($this->_refund) { diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 4b27bae608..67300ced8c 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -448,11 +448,8 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP $dates = array('receive_date', 'receipt_date', 'cancel_date', 'thankyou_date'); foreach ($dates as $key) { if (!empty($defaults[$key])) { - list($defaults[$key], - $defaults[$key . '_time'] - ) = CRM_Utils_Date::setDateDefaults(CRM_Utils_Array::value($key, $defaults), - 'activityDateTime' - ); + list($defaults[$key], $defaults[$key . '_time']) + = CRM_Utils_Date::setDateDefaults(CRM_Utils_Array::value($key, $defaults), 'activityDateTime'); } } diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index af607b8e1c..243daceaba 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * diff --git a/CRM/Contribute/Form/SearchContribution.php b/CRM/Contribute/Form/SearchContribution.php index 5601abe340..647bf28268 100644 --- a/CRM/Contribute/Form/SearchContribution.php +++ b/CRM/Contribute/Form/SearchContribution.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * diff --git a/CRM/Contribute/Import/Parser.php b/CRM/Contribute/Import/Parser.php index e26dd057b1..097cc8c3f9 100644 --- a/CRM/Contribute/Import/Parser.php +++ b/CRM/Contribute/Import/Parser.php @@ -305,7 +305,7 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser { if ($returnCode == self::DUPLICATE) { if ($returnCode == self::MULTIPLE_DUPE) { /* TODO: multi-dupes should be counted apart from singles - * on non-skip action */ + * on non-skip action */ } $this->_duplicateCount++; $recordNumber = $this->_lineCount; diff --git a/CRM/Contribute/PseudoConstant.php b/CRM/Contribute/PseudoConstant.php index 0204a72244..38d41c0f95 100644 --- a/CRM/Contribute/PseudoConstant.php +++ b/CRM/Contribute/PseudoConstant.php @@ -22,8 +22,8 @@ | at info[AT]civicrm[DOT]org. If you have questions about the | | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +------- -------------------------------------------------------------+ -*/ + +--------------------------------------------------------------------+ + */ /** * diff --git a/CRM/Contribute/Selector/Search.php b/CRM/Contribute/Selector/Search.php index 0a65983a9d..1bd7aa97cc 100644 --- a/CRM/Contribute/Selector/Search.php +++ b/CRM/Contribute/Selector/Search.php @@ -511,8 +511,7 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C self::$_columnHeaders = array_merge($pre, self::$_columnHeaders); } if ($this->_includeSoftCredits) { - self::$_columnHeaders - = array_merge( + self::$_columnHeaders = array_merge( self::$_columnHeaders, array( array( diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php index 477564504a..48096aac15 100644 --- a/CRM/Core/BAO/ActionSchedule.php +++ b/CRM/Core/BAO/ActionSchedule.php @@ -24,7 +24,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php index d6866ad381..cafff343e5 100644 --- a/CRM/Core/BAO/Address.php +++ b/CRM/Core/BAO/Address.php @@ -1292,8 +1292,6 @@ SELECT is_primary, // Not a real field in this entity case 'world_region': return CRM_Core_PseudoConstant::worldRegion(); - - break; } return CRM_Core_PseudoConstant::get(__CLASS__, $fieldName, $params, $context); } diff --git a/CRM/Core/BAO/Cache.php b/CRM/Core/BAO/Cache.php index 4c12c942b7..1d4c293dae 100644 --- a/CRM/Core/BAO/Cache.php +++ b/CRM/Core/BAO/Cache.php @@ -272,14 +272,14 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache { } /* Retrieve the session values from the cache and populate the $_SESSION array - * - * @param array $names - * Array of session values that should be persisted. - * This is either a form name + qfKey or just a form name - * (in the case of profile) - * - * @return void - */ + * + * @param array $names + * Array of session values that should be persisted. + * This is either a form name + qfKey or just a form name + * (in the case of profile) + * + * @return void + */ /** * @param string $names diff --git a/CRM/Core/IDS.php b/CRM/Core/IDS.php index 94ea4d2e55..a66d6843f3 100644 --- a/CRM/Core/IDS.php +++ b/CRM/Core/IDS.php @@ -215,7 +215,7 @@ class CRM_Core_IDS { $ip = (isset($_SERVER['SERVER_ADDR']) && $_SERVER['SERVER_ADDR'] != '127.0.0.1') ? $_SERVER['SERVER_ADDR'] : ( isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : '127.0.0.1' - ); + ); $data = array(); $session = CRM_Core_Session::singleton(); diff --git a/CRM/Event/Form/ManageEvent/Registration.php b/CRM/Event/Form/ManageEvent/Registration.php index 243398cbbe..5791901056 100644 --- a/CRM/Event/Form/ManageEvent/Registration.php +++ b/CRM/Event/Form/ManageEvent/Registration.php @@ -183,19 +183,13 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent $defaults['approval_req_text'] = CRM_Utils_Array::value('approval_req_text', $defaults, ts('Participation in this event requires approval. Submit your registration request here. Once approved, you will receive an email with a link to a web page where you can complete the registration process.')); if (!empty($defaults['registration_start_date'])) { - list($defaults['registration_start_date'], - $defaults['registration_start_date_time'] - ) = CRM_Utils_Date::setDateDefaults($defaults['registration_start_date'], - 'activityDateTime' - ); + list($defaults['registration_start_date'], $defaults['registration_start_date_time']) + = CRM_Utils_Date::setDateDefaults($defaults['registration_start_date'], 'activityDateTime'); } if (!empty($defaults['registration_end_date'])) { - list($defaults['registration_end_date'], - $defaults['registration_end_date_time'] - ) = CRM_Utils_Date::setDateDefaults($defaults['registration_end_date'], - 'activityDateTime' - ); + list($defaults['registration_end_date'], $defaults['registration_end_date_time']) + = CRM_Utils_Date::setDateDefaults($defaults['registration_end_date'], 'activityDateTime'); } return $defaults; diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index de479d0ba9..3ee04fe61c 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -530,11 +530,8 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment } } - list($defaults[$this->_id]['register_date'], - $defaults[$this->_id]['register_date_time'] - ) = CRM_Utils_Date::setDateDefaults( - CRM_Utils_Array::value('register_date', $defaults[$this->_id]), 'activityDateTime' - ); + list($defaults[$this->_id]['register_date'], $defaults[$this->_id]['register_date_time']) + = CRM_Utils_Date::setDateDefaults(CRM_Utils_Array::value('register_date', $defaults[$this->_id]), 'activityDateTime'); //assign event and role id, this is needed for Custom data building $sep = CRM_Core_DAO::VALUE_SEPARATOR; diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php index 44af54b73c..f123b6fba5 100644 --- a/CRM/Financial/BAO/FinancialType.php +++ b/CRM/Financial/BAO/FinancialType.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php index d415821f91..962337af15 100644 --- a/CRM/Financial/BAO/PaymentProcessor.php +++ b/CRM/Financial/BAO/PaymentProcessor.php @@ -336,7 +336,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces $processors['values'][$processor['id']]['object'] = CRM_Core_Payment::singleton($mode, $processor); } /* - CRM_Utils_Cache::singleton()->set($cacheKey, $processors); + CRM_Utils_Cache::singleton()->set($cacheKey, $processors); */ return $processors['values']; } diff --git a/CRM/Financial/BAO/PaymentProcessorType.php b/CRM/Financial/BAO/PaymentProcessorType.php index adc570b22d..49e7a4fe82 100644 --- a/CRM/Financial/BAO/PaymentProcessorType.php +++ b/CRM/Financial/BAO/PaymentProcessorType.php @@ -112,7 +112,7 @@ class CRM_Financial_BAO_PaymentProcessorType extends CRM_Financial_DAO_PaymentPr $paymentProcessorType = new CRM_Financial_DAO_PaymentProcessorType(); $paymentProcessorType->copyValues($params); - /* + /* @codingStandardsIgnoreStart // adapted from CRM_Core_Extensions_Payment::install foreach (array( 'class_name', @@ -134,12 +134,12 @@ class CRM_Financial_BAO_PaymentProcessorType extends CRM_Financial_DAO_PaymentPr 'billing_mode', 'is_recur', 'payment_type' - ) as $trimmable) { + ) as $trimmable) { if (isset($paymentProcessorType->{$trimmable})) { $paymentProcessorType->{$trimmable} = trim($paymentProcessorType->{$trimmable}); } } - */ + @codingStandardsIgnoreEnd */ if (isset($paymentProcessorType->billing_mode)) { // ugh unidirectional manipulation diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php index 30de6ce27a..636cb7be7f 100644 --- a/CRM/Financial/Form/BatchTransaction.php +++ b/CRM/Financial/Form/BatchTransaction.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * diff --git a/CRM/Financial/Form/FinancialType.php b/CRM/Financial/Form/FinancialType.php index c3d4ca9d2a..6679b83983 100644 --- a/CRM/Financial/Form/FinancialType.php +++ b/CRM/Financial/Form/FinancialType.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * diff --git a/CRM/Financial/Page/BatchTransaction.php b/CRM/Financial/Page/BatchTransaction.php index baf1e964c1..5c164c068e 100644 --- a/CRM/Financial/Page/BatchTransaction.php +++ b/CRM/Financial/Page/BatchTransaction.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * diff --git a/CRM/Financial/Page/FinancialType.php b/CRM/Financial/Page/FinancialType.php index f5625d88cd..8052e60bab 100644 --- a/CRM/Financial/Page/FinancialType.php +++ b/CRM/Financial/Page/FinancialType.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * diff --git a/CRM/Grant/Form/Search.php b/CRM/Grant/Form/Search.php index fa8d5696e5..160beb12ed 100644 --- a/CRM/Grant/Form/Search.php +++ b/CRM/Grant/Form/Search.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing +--------------------------------------------------------------------+ -*/ + */ /** * diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 977285787f..43a9a07884 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -205,7 +205,7 @@ class CRM_Mailing_BAO_Mailing extends CRM_Mailing_DAO_Mailing { ); /* Add all the members of groups excluded from this mailing to the temp - * table */ + * table */ $excludeSubGroup = "INSERT INTO X_$job_id (contact_id) SELECT DISTINCT $g2contact.contact_id @@ -219,7 +219,7 @@ class CRM_Mailing_BAO_Mailing extends CRM_Mailing_DAO_Mailing { $mailingGroup->query($excludeSubGroup); /* Add all unsubscribe members of base group from this mailing to the temp - * table */ + * table */ $unSubscribeBaseGroup = "INSERT INTO X_$job_id (contact_id) SELECT DISTINCT $g2contact.contact_id @@ -233,7 +233,7 @@ class CRM_Mailing_BAO_Mailing extends CRM_Mailing_DAO_Mailing { $mailingGroup->query($unSubscribeBaseGroup); /* Add all the (intended) recipients of an excluded prior mailing to - * the temp table */ + * the temp table */ $excludeSubMailing = "INSERT IGNORE INTO X_$job_id (contact_id) SELECT DISTINCT $eq.contact_id @@ -290,7 +290,7 @@ WHERE c.group_id = {$groupDAO->id} ); /* Get the group contacts, but only those which are not in the - * exclusion temp table */ + * exclusion temp table */ $query = "REPLACE INTO I_$job_id (email_id, contact_id) diff --git a/CRM/Mailing/Event/BAO/Forward.php b/CRM/Mailing/Event/BAO/Forward.php index cc325aa770..09c2331fab 100644 --- a/CRM/Mailing/Event/BAO/Forward.php +++ b/CRM/Mailing/Event/BAO/Forward.php @@ -92,7 +92,7 @@ class CRM_Mailing_Event_BAO_Forward extends CRM_Mailing_Event_DAO_Forward { (isset($dao->do_not_email) && $dao->do_not_email == 1) ) { /* We already sent this mailing to $forward_email, or we should - * never email this contact. Give up. */ + * never email this contact. Give up. */ return $successfulForward; } diff --git a/CRM/Mailing/Event/BAO/Resubscribe.php b/CRM/Mailing/Event/BAO/Resubscribe.php index c6e0ac20e4..b23e397247 100644 --- a/CRM/Mailing/Event/BAO/Resubscribe.php +++ b/CRM/Mailing/Event/BAO/Resubscribe.php @@ -102,7 +102,7 @@ class CRM_Mailing_Event_BAO_Resubscribe { ); /* Make a list of groups and a list of prior mailings that received - * this mailing */ + * this mailing */ $groups = array(); $mailings = array(); @@ -117,7 +117,7 @@ class CRM_Mailing_Event_BAO_Resubscribe { } /* As long as we have prior mailings, find their groups and add to the - * list */ + * list */ while (!empty($mailings)) { $do->query(" @@ -144,7 +144,7 @@ class CRM_Mailing_Event_BAO_Resubscribe { CRM_Utils_Hook::unsubscribeGroups('resubscribe', $mailing_id, $contact_id, $group_ids, $base_groups); /* Now we have a complete list of recipient groups. Filter out all - * those except smart groups and those that the contact belongs to */ + * those except smart groups and those that the contact belongs to */ $do->query(" SELECT $group.id as group_id, diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index a352f8636b..315efb07db 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -1845,12 +1845,8 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; // & we should aim to move this function to the BAO layer in future. // however, we can assume that the contact_id passed in by the batch // function will be the recipient - list( - $form->_contributorDisplayName, - $form->_contributorEmail - ) = CRM_Contact_BAO_Contact_Location::getEmailDetails( - $formValues['contact_id'] - ); + list($form->_contributorDisplayName, $form->_contributorEmail) + = CRM_Contact_BAO_Contact_Location::getEmailDetails($formValues['contact_id']); if (empty($form->_receiptContactId) || $isBatchProcess) { $form->_receiptContactId = $formValues['contact_id']; } -- 2.25.1