INFRA-132 - Drupal.WhiteSpace.ScopeIndent.Incorrect
authorTim Otten <totten@civicrm.org>
Tue, 20 Jan 2015 04:28:23 +0000 (20:28 -0800)
committerTim Otten <totten@civicrm.org>
Tue, 20 Jan 2015 04:28:23 +0000 (20:28 -0800)
28 files changed:
CRM/Campaign/Form/Campaign.php
CRM/Contact/BAO/GroupContact.php
CRM/Contact/Page/View.php
CRM/Contribute/Form/AdditionalPayment.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Contribute/Form/SearchContribution.php
CRM/Contribute/Import/Parser.php
CRM/Contribute/PseudoConstant.php
CRM/Contribute/Selector/Search.php
CRM/Core/BAO/ActionSchedule.php
CRM/Core/BAO/Address.php
CRM/Core/BAO/Cache.php
CRM/Core/IDS.php
CRM/Event/Form/ManageEvent/Registration.php
CRM/Event/Form/Participant.php
CRM/Financial/BAO/FinancialType.php
CRM/Financial/BAO/PaymentProcessor.php
CRM/Financial/BAO/PaymentProcessorType.php
CRM/Financial/Form/BatchTransaction.php
CRM/Financial/Form/FinancialType.php
CRM/Financial/Page/BatchTransaction.php
CRM/Financial/Page/FinancialType.php
CRM/Grant/Form/Search.php
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/Event/BAO/Forward.php
CRM/Mailing/Event/BAO/Resubscribe.php
CRM/Member/Form/Membership.php

index 7517ce70cbe9a0bf8fc813bc83d19476c27d5457..c80c7b7b061fa017e7aeb56acfb11843579abbb1 100644 (file)
@@ -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'])) {
index 936bc0cba3c565be2ff09e2d494ec27cff2e9242..8616165c39eaea49d552f3546746370f66817687 100644 (file)
@@ -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();
index 68d24a9a7084fa84a40cee252707950f5ce514e0..fcd335de8763946b7c87cb02734fb71d70246be8 100644 (file)
@@ -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
-    );
+      );
   }
 
   /**
index 0907be076b49d2adbe218ad77bba33e4b12b6f42..61101dac20734bb51bf7f14cd9bb74873285adcc 100644 (file)
@@ -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) {
index 4b27bae60807288374c47a7233b98a4ced7def77..67300ced8c4dffdcb7a5c1259fd6ade01eb50331 100644 (file)
@@ -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');
       }
     }
 
index af607b8e1c43b6e9ee49feff3bf0ae5ac299f301..243daceabab84b8ecbdd3a7acf558a3fb44f58b6 100644 (file)
@@ -23,7 +23,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
index 5601abe340cf46e459d7eec0074306ab11f6500d..647bf28268a3ee6782dcaa2e90866586d2e513b9 100644 (file)
@@ -23,7 +23,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
index e26dd057b1fe393c751942b185f7b99057a6d384..097cc8c3f901195dabf8fab9213da8ef5433e1c7 100644 (file)
@@ -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;
index 0204a72244f9b9db01685aae4886033e8812dd09..38d41c0f9571dfc42f312441ad07161eed16a9a0 100644 (file)
@@ -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        |
- +------- -------------------------------------------------------------+
-*/
+ +--------------------------------------------------------------------+
+ */
 
 /**
  *
index 0a65983a9df2b81c18f2eb51a8f5e2195a9b1994..1bd7aa97cc1da8730b1b7bec6de9e61eb8f197a2 100644 (file)
@@ -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(
index 477564504a52f27638abb51bcc5122c79369e9c5..48096aac1501149377653f98e82b7d2600ff1e8d 100644 (file)
@@ -24,7 +24,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
index d6866ad381560052f058124596a8a7d09e6977f7..cafff343e5155f0f51452b5752f4b6ad49266f57 100644 (file)
@@ -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);
   }
index 4c12c942b7c818422603fc6cb8368a0a378e1d9a..1d4c293daece406562db7eafe506280a9aa5bdc4 100644 (file)
@@ -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
index 94ea4d2e556d8858989c7d7b98c68cbbb295c5b1..a66d6843f3cd0f6717f259274b95b40dc834b534 100644 (file)
@@ -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();
index 243398cbbe540af71cf66b651f3b2a68efd4659d..579190105698c35c01c78630a2e16bc5ba88eee9 100644 (file)
@@ -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;
index de479d0ba9d3a3e2291cfe14a482bbfd90a4869e..3ee04fe61c43c0aba6479f81e8d2fe4f61dc7f5a 100644 (file)
@@ -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;
index 44af54b73c088a0f20daed654c256f1f81f19352..f123b6fba539d0c800f146e1e5bfa11a91c7d098 100644 (file)
@@ -23,7 +23,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
index d415821f91b021993187b399bb3d9cd3e6117787..962337af150fd5af68e00ac9077b7ba22e737fc0 100644 (file)
@@ -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'];
   }
index adc570b22ddaaa39c672c75d9e51f973673095d7..49e7a4fe82b040410c6a744564a1037631d0609e 100644 (file)
@@ -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
index 30de6ce27a618a5b0d9781beac2b030e6294e759..636cb7be7f2cf0f1b1c42a4a9cf7308d1aee3b53 100644 (file)
@@ -23,7 +23,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
index c3d4ca9d2a923e9da358e94ded69dd8b5efd0558..6679b8398319932036977d1c455121187d54bf53 100644 (file)
@@ -23,7 +23,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
index baf1e964c17b139719239a44c5bcffa6a0c62b77..5c164c068e1264b634a4c4943acb17b2ca0bda7d 100644 (file)
@@ -23,7 +23,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
index f5625d88cdc01773b51240e88589ecb36a92d7fd..8052e60babd54f831d425d72438b21d3a2db21f1 100644 (file)
@@ -23,7 +23,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
index fa8d5696e58d3ab25f4feb32d6ca8d60956c8e2d..160beb12edb727d2d8af04e7dc45722673db4687 100644 (file)
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
index 977285787f3ae3762d334ac458b311eaae515e53..43a9a07884373531b7c551b6380bd94422225caf 100644 (file)
@@ -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)
 
index cc325aa7706363c5fd156fe7c17b060af010408a..09c2331fab37bf8387c92dab589dd81f29118831 100644 (file)
@@ -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;
     }
index c6e0ac20e4e556e7be5e6b8c0f324659a5ca8881..b23e3972471bf77f5dd1240e9e05d204507357a2 100644 (file)
@@ -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,
index a352f8636b082ac711f213a3aa840488e4b3ed38..315efb07dbff6fbff2f24d1c42fd79c72567a0a5 100644 (file)
@@ -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'];
       }