From e70a7fc01e4d73954614f33ff4ba352ec41c2334 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Mon, 19 Jan 2015 18:46:18 -0800 Subject: [PATCH] INFRA-132 - phpcbf Drupal.WhiteSpace.ScopeIndent.IncorrectExact The automated cleanup sometimes screws with long, commented code blocks and with statements that end "));", so I reviewed the diff manually fixed any egregious examples. --- CRM/ACL/BAO/ACL.php | 16 +++--- CRM/ACL/Form/WordPress/Permissions.php | 2 +- CRM/Activity/Form/Search.php | 2 +- CRM/Activity/Import/Parser.php | 2 +- CRM/Admin/Form/LabelFormats.php | 8 +-- CRM/Admin/Page/Persistent.php | 2 +- CRM/Campaign/Form/Survey/Main.php | 6 +-- CRM/Campaign/Form/Survey/Results.php | 6 +-- CRM/Campaign/Page/Petition/ThankYou.php | 12 ++--- CRM/Case/Audit/Audit.php | 2 +- CRM/Case/Form/Search.php | 8 +-- CRM/Contact/BAO/Group.php | 2 +- CRM/Contact/BAO/GroupNesting.php | 24 ++++----- CRM/Contact/BAO/Relationship.php | 20 +++---- CRM/Contact/Form/Search/Custom/PriceSet.php | 10 ++-- .../Form/Search/Custom/TagContributions.php | 6 +-- CRM/Contact/Import/Form/DataSource.php | 16 +++--- CRM/Contact/Import/Parser.php | 6 +-- CRM/Contact/Page/DedupeRules.php | 6 +-- CRM/Contribute/Form/AdditionalInfo.php | 2 +- CRM/Core/BAO/CustomField.php | 2 +- CRM/Core/BAO/CustomGroup.php | 4 +- CRM/Core/BAO/Email.php | 10 ++-- CRM/Core/BAO/Location.php | 2 +- CRM/Core/BAO/PrevNextCache.php | 2 +- CRM/Core/I18n/SchemaStructure_3_2_beta4.php | 2 +- CRM/Core/I18n/SchemaStructure_3_3_beta1.php | 2 +- CRM/Core/I18n/SchemaStructure_3_4_0.php | 2 +- CRM/Core/I18n/SchemaStructure_3_4_beta2.php | 2 +- CRM/Core/I18n/SchemaStructure_3_4_beta3.php | 2 +- CRM/Core/I18n/SchemaStructure_4_1_0.php | 2 +- CRM/Core/I18n/SchemaStructure_4_1_alpha1.php | 2 +- CRM/Core/I18n/SchemaStructure_4_2_alpha1.php | 2 +- CRM/Core/I18n/SchemaStructure_4_3_1.php | 2 +- CRM/Core/I18n/SchemaStructure_4_5_alpha1.php | 2 +- CRM/Core/I18n/SchemaStructure_4_5_beta2.php | 2 +- CRM/Core/ManagedEntities.php | 2 +- CRM/Core/OptionValue.php | 2 +- CRM/Core/Payment/Elavon.php | 2 +- CRM/Core/Payment/FirstData.php | 10 ++-- CRM/Core/Payment/GoogleIPN.php | 4 +- CRM/Core/Payment/Moneris.php | 10 ++-- CRM/Core/Payment/PayPalProIPN.php | 22 ++++---- CRM/Core/Payment/PayflowPro.php | 20 +++---- CRM/Core/Payment/PaymentExpress.php | 2 +- CRM/Core/Payment/PaymentExpressIPN.php | 4 +- CRM/Core/Payment/eWAY.php | 52 +++++++++---------- CRM/Core/Resources.php | 2 +- CRM/Core/SelectValues.php | 20 +++---- CRM/Custom/Form/CustomData.php | 2 +- CRM/Custom/Import/Parser.php | 2 +- .../QueryBuilder/IndividualUnsupervised.php | 2 +- CRM/Event/BAO/Participant.php | 16 +++--- CRM/Event/Badge.php | 8 +-- CRM/Event/Badge/NameTent.php | 8 +-- CRM/Event/Badge/Simple.php | 8 +-- CRM/Event/Cart/BAO/MerParticipant.php | 2 +- CRM/Event/Form/Registration.php | 6 +-- CRM/Event/Import/Field.php | 4 +- CRM/Event/Import/Parser.php | 2 +- CRM/Extension/Mapper.php | 2 +- CRM/Mailing/Event/BAO/TrackableURLOpen.php | 2 +- CRM/Mailing/Event/BAO/Unsubscribe.php | 8 +-- CRM/Mailing/Form/ForwardMailing.php | 2 +- CRM/Mailing/Form/Upload.php | 2 +- CRM/Member/Import/Parser.php | 2 +- CRM/Member/Page/DashBoard.php | 5 +- CRM/Pledge/Form/Search.php | 2 +- CRM/Price/BAO/PriceField.php | 2 +- CRM/Price/BAO/PriceSet.php | 2 +- CRM/Price/Form/Option.php | 10 ++-- CRM/Report/Form.php | 6 +-- CRM/Report/Form/Case/Demographics.php | 2 +- CRM/Report/Form/Contribute/Detail.php | 6 +-- .../Form/Event/ParticipantListCount.php | 2 +- CRM/Report/Form/Event/ParticipantListing.php | 2 +- CRM/Report/Form/Member/ContributionDetail.php | 2 +- CRM/SMS/Form/Upload.php | 2 +- CRM/Upgrade/Form.php | 2 +- CRM/Utils/Cache/SerializeCache.php | 2 +- CRM/Utils/Date.php | 16 +++--- CRM/Utils/DeprecatedUtils.php | 26 +++++----- CRM/Utils/Geocode/Google.php | 2 +- CRM/Utils/Geocode/Yahoo.php | 12 ++--- CRM/Utils/JS.php | 2 +- CRM/Utils/Rule.php | 3 +- CRM/Utils/String.php | 6 +-- CRM/Utils/System/Drupal.php | 8 +-- CRM/Utils/System/Drupal6.php | 5 +- CRM/Utils/Token.php | 2 +- CRM/Utils/Weight.php | 2 +- api/v3/Case.php | 2 +- api/v3/CaseType.php | 2 +- api/v3/Contact.php | 2 +- api/v3/Domain.php | 4 +- api/v3/Generic/Getactions.php | 2 +- api/v3/Generic/Getlist.php | 2 +- api/v3/MessageTemplate.php | 2 +- api/v3/Profile.php | 2 +- api/v3/ReportTemplate.php | 5 +- api/v3/utils.php | 2 +- tests/phpunit/CRM/Contact/BAO/ContactTest.php | 4 +- tests/phpunit/CRM/Core/BAO/SettingTest.php | 10 ++-- tests/phpunit/CRM/Core/JobManagerTest.php | 2 +- .../phpunit/CRM/Core/Payment/BaseIPNTest.php | 3 +- .../CRM/Core/Payment/PayPalProIPNTest.php | 2 +- .../Extension/Container/CollectionTest.php | 2 +- .../CRM/Extension/Manager/PaymentTest.php | 2 +- tests/phpunit/CRM/Extension/ManagerTest.php | 2 +- tests/phpunit/CRM/Extension/MapperTest.php | 10 ++-- .../Member/Import/Parser/MembershipTest.php | 18 +++---- tests/phpunit/CRM/Utils/JSTest.php | 2 +- .../CRM/Utils/Migrate/ImportExportTest.php | 4 +- tests/phpunit/CRM/Utils/SignerTest.php | 2 +- tests/phpunit/CRM/Utils/ZipTest.php | 2 +- tests/phpunit/CiviTest/bootstrap.php | 8 +-- .../WebTest/Contact/MergeContactsTest.php | 3 +- .../Contribute/VerifySSLContributionTest.php | 4 +- .../WebTest/Event/ParticipantSearchTest.php | 2 +- .../Import/MultipleRelationshipTest.php | 2 +- .../WebTest/Member/StandaloneAddTest.php | 2 +- tests/phpunit/api/v3/APIStandardsTest.php | 10 ++-- tests/phpunit/api/v3/CampaignTest.php | 2 +- tests/phpunit/api/v3/CustomFieldTest.php | 36 ++++++------- tests/phpunit/api/v3/DomainTest.php | 6 +-- tests/phpunit/api/v3/EmailTest.php | 2 +- tests/phpunit/api/v3/EventTest.php | 10 ++-- tests/phpunit/api/v3/LineItemTest.php | 2 +- tests/phpunit/api/v3/LocBlockTest.php | 2 +- tests/phpunit/api/v3/MailSettingsTest.php | 2 +- tests/phpunit/api/v3/MailingGroupTest.php | 2 +- tests/phpunit/api/v3/MembershipTypeTest.php | 2 +- tests/phpunit/api/v3/OptionGroupTest.php | 2 +- tests/phpunit/api/v3/OptionValueTest.php | 5 +- .../api/v3/ParticipantStatusTypeTest.php | 2 +- tests/phpunit/api/v3/ParticipantTest.php | 2 +- tests/phpunit/api/v3/PriceFieldTest.php | 2 +- tests/phpunit/api/v3/PriceFieldValueTest.php | 2 +- tests/phpunit/api/v3/PriceSetTest.php | 2 +- tests/phpunit/api/v3/ProfileTest.php | 2 +- tests/phpunit/api/v3/RelationshipTypeTest.php | 2 +- tests/phpunit/api/v3/ReportTemplateTest.php | 2 +- tests/phpunit/api/v3/SystemTest.php | 2 +- .../api/v3/TaxContributionPageTest.php | 2 +- 144 files changed, 391 insertions(+), 384 deletions(-) diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php index 09cdf29e51..9e5e2fb9cc 100644 --- a/CRM/ACL/BAO/ACL.php +++ b/CRM/ACL/BAO/ACL.php @@ -228,7 +228,7 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL { AND {$t['GroupContact']}.status = 'Added')"; /* Query for permissions granted through an ACL group to a Contact - * group */ + * group */ $query[] = "SELECT {$t['ACL']}.*, 0 as override FROM {$t['ACL']} @@ -262,10 +262,10 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL { while ($dao->fetch()) { /* Instant bypass for the following cases: - * 1) the rule governs all tables - * 2) the rule governs all objects in the table in question - * 3) the rule governs the specific object we want - */ + * 1) the rule governs all tables + * 2) the rule governs all objects in the table in question + * 3) the rule governs the specific object we want + */ if (empty($dao->object_table) || ($dao->object_table == $object_table @@ -284,8 +284,8 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL { ); /* If the clause returned is null, then the rule is a blanket - * (id is null) on a table other than the one we're interested - * in. So skip it. */ + * (id is null) on a table other than the one we're interested + * in. So skip it. */ if (empty($clause)) { continue; @@ -293,7 +293,7 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL { } /* Now we figure out if this is an allow or deny rule, and possibly - * a contact-level override */ + * a contact-level override */ if ($dao->deny) { $deny[] = $clause; diff --git a/CRM/ACL/Form/WordPress/Permissions.php b/CRM/ACL/Form/WordPress/Permissions.php index 3780e7d806..d9937254aa 100644 --- a/CRM/ACL/Form/WordPress/Permissions.php +++ b/CRM/ACL/Form/WordPress/Permissions.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/Activity/Form/Search.php b/CRM/Activity/Form/Search.php index 549571b4c7..9c30ef073f 100644 --- a/CRM/Activity/Form/Search.php +++ b/CRM/Activity/Form/Search.php @@ -385,7 +385,7 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { // Activity date time assumes midnight at the beginning of the date // This sets it to almost midnight at the end of the date /* if ($dateHigh <= 99999999) { - $dateHigh = 1000000 * $dateHigh + 235959; + $dateHigh = 1000000 * $dateHigh + 235959; } */ $dateHigh = date('m/d/Y', strtotime($dateHigh)); $this->_formValues['activity_date_relative'] = 0; diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php index b4222a6a68..1ee8ad5230 100644 --- a/CRM/Activity/Import/Parser.php +++ b/CRM/Activity/Import/Parser.php @@ -200,7 +200,7 @@ abstract class CRM_Activity_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/Admin/Form/LabelFormats.php b/CRM/Admin/Form/LabelFormats.php index 280b227717..a0645235b4 100644 --- a/CRM/Admin/Form/LabelFormats.php +++ b/CRM/Admin/Form/LabelFormats.php @@ -90,16 +90,16 @@ class CRM_Admin_Form_LabelFormats extends CRM_Admin_Form { // currently we support only mailing label creation, hence comment below code /* $options = array( - 'label_format' => ts('Mailing Label'), - 'name_badge' => ts('Name Badge'), + 'label_format' => ts('Mailing Label'), + 'name_badge' => ts('Name Badge'), ); $labelType = $this->addRadio('label_type', ts('Used For'), $options, null, '  '); if ($this->_action != CRM_Core_Action::ADD) { - $labelType->freeze(); + $labelType->freeze(); } - */ + */ $this->add('select', 'paper_size', ts('Sheet Size'), array( diff --git a/CRM/Admin/Page/Persistent.php b/CRM/Admin/Page/Persistent.php index 91d04755dc..c9081233c3 100644 --- a/CRM/Admin/Page/Persistent.php +++ b/CRM/Admin/Page/Persistent.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/Campaign/Form/Survey/Main.php b/CRM/Campaign/Form/Survey/Main.php index 8418b29a27..5b3dd92cc7 100644 --- a/CRM/Campaign/Form/Survey/Main.php +++ b/CRM/Campaign/Form/Survey/Main.php @@ -40,9 +40,9 @@ class CRM_Campaign_Form_Survey_Main extends CRM_Campaign_Form_Survey { /* values - * - * @var array - */ + * + * @var array + */ public $_values; diff --git a/CRM/Campaign/Form/Survey/Results.php b/CRM/Campaign/Form/Survey/Results.php index 717fd634eb..5d5f4a92ec 100644 --- a/CRM/Campaign/Form/Survey/Results.php +++ b/CRM/Campaign/Form/Survey/Results.php @@ -44,9 +44,9 @@ class CRM_Campaign_Form_Survey_Results extends CRM_Campaign_Form_Survey { protected $_reportTitle; /* values - * - * @var array - */ + * + * @var array + */ public $_values; const NUM_OPTION = 11; diff --git a/CRM/Campaign/Page/Petition/ThankYou.php b/CRM/Campaign/Page/Petition/ThankYou.php index 3e3d90683e..13e4faf982 100644 --- a/CRM/Campaign/Page/Petition/ThankYou.php +++ b/CRM/Campaign/Page/Petition/ThankYou.php @@ -52,12 +52,12 @@ class CRM_Campaign_Page_Petition_ThankYou extends CRM_Core_Page { // send thank you or email verification emails /* - * sendEmailMode - * 1 = connected user via login/pwd - thank you - * or dedupe contact matched who doesn't have a tag CIVICRM_TAG_UNCONFIRMED - thank you - * login using fb connect - thank you + click to add msg to fb wall - * 2 = send a confirmation request email - */ + * sendEmailMode + * 1 = connected user via login/pwd - thank you + * or dedupe contact matched who doesn't have a tag CIVICRM_TAG_UNCONFIRMED - thank you + * login using fb connect - thank you + click to add msg to fb wall + * 2 = send a confirmation request email + */ return parent::run(); } diff --git a/CRM/Case/Audit/Audit.php b/CRM/Case/Audit/Audit.php index e7cbd4f9bc..c1022490aa 100644 --- a/CRM/Case/Audit/Audit.php +++ b/CRM/Case/Audit/Audit.php @@ -225,7 +225,7 @@ class CRM_Case_Audit_Audit { $fh = fopen('C:/temp/audit2.xml', 'w'); fwrite($fh, $xmlString); fclose($fh); - */ + */ $audit = new CRM_Case_Audit_Audit($xmlString, 'audit.conf.xml'); $activities = $audit->getActivities($printReport); diff --git a/CRM/Case/Form/Search.php b/CRM/Case/Form/Search.php index b62b3cfb58..47a37ccfce 100644 --- a/CRM/Case/Form/Search.php +++ b/CRM/Case/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 +--------------------------------------------------------------------+ -*/ + */ /** * @@ -96,9 +96,9 @@ class CRM_Case_Form_Search extends CRM_Core_Form_Search { $this->defaults = array(); /* - * we allow the controller to set force/reset externally, useful when we are being - * driven by the wizard framework - */ + * we allow the controller to set force/reset externally, useful when we are being + * driven by the wizard framework + */ $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject); $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE); diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php index 0835a6ae0a..a62c2bd822 100644 --- a/CRM/Contact/BAO/Group.php +++ b/CRM/Contact/BAO/Group.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/Contact/BAO/GroupNesting.php b/CRM/Contact/BAO/GroupNesting.php index efe75f0f07..b065d4a172 100644 --- a/CRM/Contact/BAO/GroupNesting.php +++ b/CRM/Contact/BAO/GroupNesting.php @@ -262,10 +262,10 @@ class CRM_Contact_BAO_GroupNesting extends CRM_Contact_DAO_GroupNesting implemen } else { /* if we get here, it could be because we're out of siblings - * (in which case we return null) or because we're at the - * top level groups which do not have parents but may still - * have siblings, so check for that first. - */ + * (in which case we return null) or because we're at the + * top level groups which do not have parents but may still + * have siblings, so check for that first. + */ $nextGroup = $this->_getNextParentlessGroup($group); if ($nextGroup) { @@ -415,8 +415,8 @@ class CRM_Contact_BAO_GroupNesting extends CRM_Contact_DAO_GroupNesting implemen $parentGroupId = $dao->parent_group_id; if ($parentGroupId == $checkGroupId) { /* print "One of these: 
";
-                print_r($groupIds);
-                print "
has groupId $checkGroupId as an ancestor.
"; */ + print_r($groupIds); + print " has groupId $checkGroupId as an ancestor.
"; */ return TRUE; } @@ -449,8 +449,8 @@ class CRM_Contact_BAO_GroupNesting extends CRM_Contact_DAO_GroupNesting implemen $childGroupId = $dao->child_group_id; if ($childGroupId == $checkGroupId) { /* print "One of these: 
";
-                 print_r($groupIds);
-                 print "
has groupId $checkGroupId as a descendent.

"; */ + print_r($groupIds); + print " has groupId $checkGroupId as a descendent.

"; */ return TRUE; } @@ -484,8 +484,8 @@ class CRM_Contact_BAO_GroupNesting extends CRM_Contact_DAO_GroupNesting implemen $parentGroupId = $dao->parent_group_id; if ($parentGroupId == $checkGroupId) { /* print "One of these: 
";
-                print_r($groupIds);
-                print "
has groupId $checkGroupId as an ancestor.
"; */ + print_r($groupIds); + print " has groupId $checkGroupId as an ancestor.
"; */ return TRUE; } @@ -525,8 +525,8 @@ class CRM_Contact_BAO_GroupNesting extends CRM_Contact_DAO_GroupNesting implemen $childGroupId = $dao->child_group_id; if ($childGroupId == $checkGroupId) { /* print "One of these: 
";
-                print_r($groupIds);
-                print "
has groupId $checkGroupId as a descendent.

"; */ + print_r($groupIds); + print " has groupId $checkGroupId as a descendent.

"; */ return TRUE; } diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php index 833a6d3fcf..341d42cac6 100644 --- a/CRM/Contact/BAO/Relationship.php +++ b/CRM/Contact/BAO/Relationship.php @@ -750,16 +750,16 @@ FROM civicrm_relationship WHERE relationship_type_id = " . CRM_Utils_Type::escape($type, 'Integer'); /* - * CRM-11792 - date fields from API are in ISO format, but this function - * supports date arrays BAO has increasingly standardised to ISO format - * so I believe this function should support ISO rather than make API - * format it - however, need to support array format for now to avoid breakage - * @ time of writing this function is called from Relationship::createMultiple (twice) - * CRM_BAO_Contact_Utils::clearCurrentEmployer (seemingly without dates) - * CRM_Contact_Form_Task_AddToOrganization::postProcess & - * CRM_Contact_Form_Task_AddToHousehold::postProcess - * (I don't think the last 2 support dates but not sure - */ + * CRM-11792 - date fields from API are in ISO format, but this function + * supports date arrays BAO has increasingly standardised to ISO format + * so I believe this function should support ISO rather than make API + * format it - however, need to support array format for now to avoid breakage + * @ time of writing this function is called from Relationship::createMultiple (twice) + * CRM_BAO_Contact_Utils::clearCurrentEmployer (seemingly without dates) + * CRM_Contact_Form_Task_AddToOrganization::postProcess & + * CRM_Contact_Form_Task_AddToHousehold::postProcess + * (I don't think the last 2 support dates but not sure + */ $dateFields = array('end_date', 'start_date'); foreach ($dateFields as $dateField) { diff --git a/CRM/Contact/Form/Search/Custom/PriceSet.php b/CRM/Contact/Form/Search/Custom/PriceSet.php index 890e7ac7ee..1c112a00ca 100644 --- a/CRM/Contact/Form/Search/Custom/PriceSet.php +++ b/CRM/Contact/Form/Search/Custom/PriceSet.php @@ -62,11 +62,11 @@ class CRM_Contact_Form_Search_Custom_PriceSet extends CRM_Contact_Form_Search_Cu public function __destruct() { /* - if ( $this->_eventID ) { - $sql = "DROP TEMPORARY TABLE {$this->_tableName}"; - CRM_Core_DAO::executeQuery( $sql ); - } - */ + if ( $this->_eventID ) { + $sql = "DROP TEMPORARY TABLE {$this->_tableName}"; + CRM_Core_DAO::executeQuery( $sql ); + } + */ } public function buildTempTable() { diff --git a/CRM/Contact/Form/Search/Custom/TagContributions.php b/CRM/Contact/Form/Search/Custom/TagContributions.php index a2e33947c7..f0347c084f 100644 --- a/CRM/Contact/Form/Search/Custom/TagContributions.php +++ b/CRM/Contact/Form/Search/Custom/TagContributions.php @@ -154,9 +154,9 @@ WHERE $where } /* - * WHERE clause is an array built from any required JOINS plus conditional filters based on search criteria field values - * - */ + * WHERE clause is an array built from any required JOINS plus conditional filters based on search criteria field values + * + */ /** * @param bool $includeContactIDs * diff --git a/CRM/Contact/Import/Form/DataSource.php b/CRM/Contact/Import/Form/DataSource.php index 79e10101f2..2d669f08b3 100644 --- a/CRM/Contact/Import/Form/DataSource.php +++ b/CRM/Contact/Import/Form/DataSource.php @@ -378,8 +378,8 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Core_Form { */ private function _prepareImportTable($db, $importTableName) { /* TODO: Add a check for an existing _status field; - * if it exists, create __status instead and return that - */ + * if it exists, create __status instead and return that + */ $statusFieldName = '_status'; $primaryKeyName = '_id'; @@ -388,12 +388,12 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Core_Form { $this->set('statusFieldName', $statusFieldName); /* Make sure the PK is always last! We rely on this later. - * Should probably stop doing that at some point, but it - * would require moving to associative arrays rather than - * relying on numerical order of the fields. This could in - * turn complicate matters for some DataSources, which - * would also not be good. Decisions, decisions... - */ + * Should probably stop doing that at some point, but it + * would require moving to associative arrays rather than + * relying on numerical order of the fields. This could in + * turn complicate matters for some DataSources, which + * would also not be good. Decisions, decisions... + */ $alterQuery = "ALTER TABLE $importTableName ADD COLUMN $statusFieldName VARCHAR(32) diff --git a/CRM/Contact/Import/Parser.php b/CRM/Contact/Import/Parser.php index 5edf0fe499..3d4a053031 100644 --- a/CRM/Contact/Import/Parser.php +++ b/CRM/Contact/Import/Parser.php @@ -298,7 +298,7 @@ abstract class CRM_Contact_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++; array_unshift($values, $this->_rowCount); @@ -329,8 +329,8 @@ abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser { // see if we've hit our timeout yet /* if ( $the_thing_with_the_stuff ) { - do_something( ); - } */ + do_something( ); + } */ } if ($mode == self::MODE_PREVIEW || $mode == self::MODE_IMPORT) { diff --git a/CRM/Contact/Page/DedupeRules.php b/CRM/Contact/Page/DedupeRules.php index fba7d07d27..862ba1bdbc 100644 --- a/CRM/Contact/Page/DedupeRules.php +++ b/CRM/Contact/Page/DedupeRules.php @@ -155,9 +155,9 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic { $action = array_sum(array_keys($this->links())); $links = self::links(); /* if ($dao->is_default) { - unset($links[CRM_Core_Action::MAP]); - unset($links[CRM_Core_Action::DELETE]); - }*/ + unset($links[CRM_Core_Action::MAP]); + unset($links[CRM_Core_Action::DELETE]); + }*/ if ($dao->is_reserved) { unset($links[CRM_Core_Action::DELETE]); diff --git a/CRM/Contribute/Form/AdditionalInfo.php b/CRM/Contribute/Form/AdditionalInfo.php index 6de4ee2693..e248660966 100644 --- a/CRM/Contribute/Form/AdditionalInfo.php +++ b/CRM/Contribute/Form/AdditionalInfo.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/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index 0244c5c777..2f94a658fd 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.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/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php index 159dc7bc2a..4c71e19ec3 100644 --- a/CRM/Core/BAO/CustomGroup.php +++ b/CRM/Core/BAO/CustomGroup.php @@ -2070,8 +2070,8 @@ SELECT IF( EXISTS(SELECT name FROM civicrm_contact_type WHERE name like %1), 1, $retValue = $value; break; } - // note that if its not text / textarea, the code falls thru and executes - // the below case also + // note that if its not text / textarea, the code falls thru and executes + // the below case also case 'StateProvince': case 'Country': $options = array(); diff --git a/CRM/Core/BAO/Email.php b/CRM/Core/BAO/Email.php index 9fd5df219d..fcd3f82671 100644 --- a/CRM/Core/BAO/Email.php +++ b/CRM/Core/BAO/Email.php @@ -79,11 +79,11 @@ class CRM_Core_BAO_Email extends CRM_Core_DAO_Email { $email->email = $strtolower($email->email); /* - * since we're setting bulkmail for 1 of this contact's emails, first reset all their other emails to is_bulkmail false - * We shouldn't not set the current email to false even though we - * are about to reset it to avoid contaminating the changelog if logging is enabled - * (only 1 email address can have is_bulkmail = true) - */ + * since we're setting bulkmail for 1 of this contact's emails, first reset all their other emails to is_bulkmail false + * We shouldn't not set the current email to false even though we + * are about to reset it to avoid contaminating the changelog if logging is enabled + * (only 1 email address can have is_bulkmail = true) + */ if ($email->is_bulkmail != 'null' && $params['contact_id'] && !self::isMultipleBulkMail()) { $sql = " UPDATE civicrm_email diff --git a/CRM/Core/BAO/Location.php b/CRM/Core/BAO/Location.php index 338fd6208f..5fa6dade98 100644 --- a/CRM/Core/BAO/Location.php +++ b/CRM/Core/BAO/Location.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/Core/BAO/PrevNextCache.php b/CRM/Core/BAO/PrevNextCache.php index 33b4f38f83..cb5bcef2e9 100644 --- a/CRM/Core/BAO/PrevNextCache.php +++ b/CRM/Core/BAO/PrevNextCache.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/Core/I18n/SchemaStructure_3_2_beta4.php b/CRM/Core/I18n/SchemaStructure_3_2_beta4.php index 957be33b94..1e8f8d89a1 100644 --- a/CRM/Core/I18n/SchemaStructure_3_2_beta4.php +++ b/CRM/Core/I18n/SchemaStructure_3_2_beta4.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/Core/I18n/SchemaStructure_3_3_beta1.php b/CRM/Core/I18n/SchemaStructure_3_3_beta1.php index 53c1a17a12..f5406dfbd6 100644 --- a/CRM/Core/I18n/SchemaStructure_3_3_beta1.php +++ b/CRM/Core/I18n/SchemaStructure_3_3_beta1.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/Core/I18n/SchemaStructure_3_4_0.php b/CRM/Core/I18n/SchemaStructure_3_4_0.php index a0703cda1f..eea773ebe6 100644 --- a/CRM/Core/I18n/SchemaStructure_3_4_0.php +++ b/CRM/Core/I18n/SchemaStructure_3_4_0.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/Core/I18n/SchemaStructure_3_4_beta2.php b/CRM/Core/I18n/SchemaStructure_3_4_beta2.php index 4b8f298b05..46f235b232 100644 --- a/CRM/Core/I18n/SchemaStructure_3_4_beta2.php +++ b/CRM/Core/I18n/SchemaStructure_3_4_beta2.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/Core/I18n/SchemaStructure_3_4_beta3.php b/CRM/Core/I18n/SchemaStructure_3_4_beta3.php index cf3e2eb08a..743a1f1c68 100644 --- a/CRM/Core/I18n/SchemaStructure_3_4_beta3.php +++ b/CRM/Core/I18n/SchemaStructure_3_4_beta3.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/Core/I18n/SchemaStructure_4_1_0.php b/CRM/Core/I18n/SchemaStructure_4_1_0.php index dc10aa66ab..1281d56a79 100644 --- a/CRM/Core/I18n/SchemaStructure_4_1_0.php +++ b/CRM/Core/I18n/SchemaStructure_4_1_0.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/Core/I18n/SchemaStructure_4_1_alpha1.php b/CRM/Core/I18n/SchemaStructure_4_1_alpha1.php index 4c878934d6..726a9a6791 100644 --- a/CRM/Core/I18n/SchemaStructure_4_1_alpha1.php +++ b/CRM/Core/I18n/SchemaStructure_4_1_alpha1.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/Core/I18n/SchemaStructure_4_2_alpha1.php b/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php index 4fa99726be..449db2f308 100644 --- a/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php +++ b/CRM/Core/I18n/SchemaStructure_4_2_alpha1.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/Core/I18n/SchemaStructure_4_3_1.php b/CRM/Core/I18n/SchemaStructure_4_3_1.php index cc411e2833..f56ea6222c 100644 --- a/CRM/Core/I18n/SchemaStructure_4_3_1.php +++ b/CRM/Core/I18n/SchemaStructure_4_3_1.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/Core/I18n/SchemaStructure_4_5_alpha1.php b/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php index 9e4ff12261..0ce4ff2976 100644 --- a/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php +++ b/CRM/Core/I18n/SchemaStructure_4_5_alpha1.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/Core/I18n/SchemaStructure_4_5_beta2.php b/CRM/Core/I18n/SchemaStructure_4_5_beta2.php index d436a9fb57..50aab894e6 100644 --- a/CRM/Core/I18n/SchemaStructure_4_5_beta2.php +++ b/CRM/Core/I18n/SchemaStructure_4_5_beta2.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/Core/ManagedEntities.php b/CRM/Core/ManagedEntities.php index bdd48147ed..67e31b332c 100644 --- a/CRM/Core/ManagedEntities.php +++ b/CRM/Core/ManagedEntities.php @@ -45,7 +45,7 @@ class CRM_Core_ManagedEntities { CRM_Core_Transaction::addCallback( CRM_Core_Transaction::PHASE_POST_COMMIT, function () { - CRM_Core_ManagedEntities::singleton(TRUE)->reconcile(); + CRM_Core_ManagedEntities::singleton(TRUE)->reconcile(); }, array(), 'ManagedEntities::reconcile' diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php index 8af262fab8..c7d695510c 100644 --- a/CRM/Core/OptionValue.php +++ b/CRM/Core/OptionValue.php @@ -214,7 +214,7 @@ class CRM_Core_OptionValue { $fieldValues = array('option_group_id' => $optionGroupID); // use the next available value /* CONVERT(value, DECIMAL) is used to convert varchar - field 'value' to decimal->integer */ + field 'value' to decimal->integer */ $params['value'] = (int) CRM_Utils_Weight::getDefaultWeight('CRM_Core_DAO_OptionValue', $fieldValues, diff --git a/CRM/Core/Payment/Elavon.php b/CRM/Core/Payment/Elavon.php index 0312c24f79..493bfec62c 100644 --- a/CRM/Core/Payment/Elavon.php +++ b/CRM/Core/Payment/Elavon.php @@ -7,7 +7,7 @@ | | | Written & Contributed by Eileen McNaughton - Nov March 2008 | +----------------------------------------------------------------------------+ -*/ + */ /** * ----------------------------------------------------------------------------------------------- diff --git a/CRM/Core/Payment/FirstData.php b/CRM/Core/Payment/FirstData.php index d26a7ef5f8..7ca813f6c4 100644 --- a/CRM/Core/Payment/FirstData.php +++ b/CRM/Core/Payment/FirstData.php @@ -12,7 +12,7 @@ | | | | +--------------------------------------------------------------------+ -*/ + */ /** * Note that in order to use FirstData / LinkPoint you need a certificate (.pem) file issued by them @@ -87,7 +87,7 @@ class CRM_Core_Payment_FirstData extends CRM_Core_Payment { */ public function mapProcessorFieldstoParams($params) { /*concatenate full customer name first - code from EWAY gateway - */ + */ $credit_card_name = $params['first_name'] . " "; if (strlen($params['middle_name']) > 0) { @@ -187,9 +187,9 @@ class CRM_Core_Payment_FirstData extends CRM_Core_Payment { $requestxml = lphp::buildXML($requestFields); /*---------------------------------------------------------------------------------------------------- - // Send to the payment information using cURL - /---------------------------------------------------------------------------------------------------- - */ + // Send to the payment information using cURL + /---------------------------------------------------------------------------------------------------- + */ $ch = curl_init($host); if (!$ch) { diff --git a/CRM/Core/Payment/GoogleIPN.php b/CRM/Core/Payment/GoogleIPN.php index cd65ef6bed..61ae8c1671 100644 --- a/CRM/Core/Payment/GoogleIPN.php +++ b/CRM/Core/Payment/GoogleIPN.php @@ -224,8 +224,8 @@ class CRM_Core_Payment_GoogleIPN extends CRM_Core_Payment_BaseIPN { } else { /* Since trxn_id hasn't got any use here, - * lets make use of it by passing the eventID/membershipTypeID to next level. - * And change trxn_id to google-order-number before finishing db update */ + * lets make use of it by passing the eventID/membershipTypeID to next level. + * And change trxn_id to google-order-number before finishing db update */ if (!empty($ids['event'])) { $contribution->trxn_id = $ids['event'] . CRM_Core_DAO::VALUE_SEPARATOR . $ids['participant']; diff --git a/CRM/Core/Payment/Moneris.php b/CRM/Core/Payment/Moneris.php index 5d6d73d8b0..91913752a6 100644 --- a/CRM/Core/Payment/Moneris.php +++ b/CRM/Core/Payment/Moneris.php @@ -98,11 +98,11 @@ class CRM_Core_Payment_Moneris extends CRM_Core_Payment { return self::error('Invalid currency selection, must be $CAD'); } /* unused params: cvv not yet implemented, payment action ingored (should test for 'Sale' value?) - [cvv2] => 000 - [ip_address] => 192.168.0.103 - [payment_action] => Sale - [contact_type] => Individual - [geo_coord_id] => 1 */ + [cvv2] => 000 + [ip_address] => 192.168.0.103 + [payment_action] => Sale + [contact_type] => Individual + [geo_coord_id] => 1 */ //this code based on Moneris example code # //create an mpgCustInfo object diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php index e1b7593804..2e433b95f0 100644 --- a/CRM/Core/Payment/PayPalProIPN.php +++ b/CRM/Core/Payment/PayPalProIPN.php @@ -206,17 +206,17 @@ class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN { $subscriptionPaymentStatus = NULL; //List of Transaction Type /* - recurring_payment_profile_created RP Profile Created - recurring_payment RP Sucessful Payment - recurring_payment_failed RP Failed Payment - recurring_payment_profile_cancel RP Profile Cancelled - recurring_payment_expired RP Profile Expired - recurring_payment_skipped RP Profile Skipped - recurring_payment_outstanding_payment RP Sucessful Outstanding Payment - recurring_payment_outstanding_payment_failed RP Failed Outstanding Payment - recurring_payment_suspended RP Profile Suspended - recurring_payment_suspended_due_to_max_failed_payment RP Profile Suspended due to Max Failed Payment - */ + recurring_payment_profile_created RP Profile Created + recurring_payment RP Sucessful Payment + recurring_payment_failed RP Failed Payment + recurring_payment_profile_cancel RP Profile Cancelled + recurring_payment_expired RP Profile Expired + recurring_payment_skipped RP Profile Skipped + recurring_payment_outstanding_payment RP Sucessful Outstanding Payment + recurring_payment_outstanding_payment_failed RP Failed Outstanding Payment + recurring_payment_suspended RP Profile Suspended + recurring_payment_suspended_due_to_max_failed_payment RP Profile Suspended due to Max Failed Payment + */ //set transaction type $txnType = $this->retrieve('txn_type', 'String'); diff --git a/CRM/Core/Payment/PayflowPro.php b/CRM/Core/Payment/PayflowPro.php index 2a73b1bd02..245caacce6 100644 --- a/CRM/Core/Payment/PayflowPro.php +++ b/CRM/Core/Payment/PayflowPro.php @@ -288,16 +288,16 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { // get the result code to validate. $result_code = $nvpArray['RESULT']; /*debug - echo "

Params array


"; - print_r($params); - echo "


"; - echo "

Values to Payment Processor


"; - print_r($payflow_query_array); - echo "


"; - echo "

Results from Payment Processor


"; - print_r($nvpArray); - echo "


"; - */ + echo "

Params array


"; + print_r($params); + echo "


"; + echo "

Values to Payment Processor


"; + print_r($payflow_query_array); + echo "


"; + echo "

Results from Payment Processor


"; + print_r($nvpArray); + echo "


"; + */ switch ($result_code) { case 0: diff --git a/CRM/Core/Payment/PaymentExpress.php b/CRM/Core/Payment/PaymentExpress.php index ab3fab382c..7cf9e374d1 100644 --- a/CRM/Core/Payment/PaymentExpress.php +++ b/CRM/Core/Payment/PaymentExpress.php @@ -21,7 +21,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/Payment/PaymentExpressIPN.php b/CRM/Core/Payment/PaymentExpressIPN.php index 281a2d0221..3b87f79970 100644 --- a/CRM/Core/Payment/PaymentExpressIPN.php +++ b/CRM/Core/Payment/PaymentExpressIPN.php @@ -172,8 +172,8 @@ class CRM_Core_Payment_PaymentExpressIPN extends CRM_Core_Payment_BaseIPN { } else { /* Since trxn_id hasn't got any use here, - * lets make use of it by passing the eventID/membershipTypeID to next level. - * And change trxn_id to the payment processor reference before finishing db update */ + * lets make use of it by passing the eventID/membershipTypeID to next level. + * And change trxn_id to the payment processor reference before finishing db update */ if ($ids['event']) { $contribution->trxn_id = $ids['event'] . CRM_Core_DAO::VALUE_SEPARATOR . $ids['participant']; diff --git a/CRM/Core/Payment/eWAY.php b/CRM/Core/Payment/eWAY.php index abf9e45092..9bb50281eb 100644 --- a/CRM/Core/Payment/eWAY.php +++ b/CRM/Core/Payment/eWAY.php @@ -54,7 +54,7 @@ | different CustomerID is used per currency. | | | +--------------------------------------------------------------------+ -*/ + */ /** * ----------------------------------------------------------------------------------------------- @@ -160,13 +160,13 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { } /* - //------------------------------------------------------------- - // NOTE: eWAY Doesn't use the following at the moment: - //------------------------------------------------------------- - $creditCardType = $params['credit_card_type']; - $currentcyID = $params['currencyID']; - $country = $params['country']; - */ + //------------------------------------------------------------- + // NOTE: eWAY Doesn't use the following at the moment: + //------------------------------------------------------------- + $creditCardType = $params['credit_card_type']; + $currentcyID = $params['currencyID']; + $country = $params['country']; + */ //------------------------------------------------------------- // Prepare some composite data from _paymentProcessor fields @@ -374,24 +374,24 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { } /* - //---------------------------------------------------------------------------------------------------- - // Test mode always returns trxn_id = 0 - so we fix that here - // - // NOTE: This code was taken from the AuthorizeNet payment processor, however it now appears - // unecessary for the eWAY gateway - Left here in case it proves useful - //---------------------------------------------------------------------------------------------------- - if ( $this->_mode == 'test' ) { - $query = "SELECT MAX(trxn_id) FROM civicrm_contribution WHERE trxn_id LIKE 'test%'"; - $p = array( ); - $trxn_id = strval( CRM_Core_Dao::singleValueQuery( $query, $p ) ); - $trxn_id = str_replace( 'test', '', $trxn_id ); - $trxn_id = intval($trxn_id) + 1; - $params['trxn_id'] = sprintf('test%08d', $trxn_id); - } - else { - $params['trxn_id'] = $eWAYResponse->TransactionNumber(); - } - */ + //---------------------------------------------------------------------------------------------------- + // Test mode always returns trxn_id = 0 - so we fix that here + // + // NOTE: This code was taken from the AuthorizeNet payment processor, however it now appears + // unecessary for the eWAY gateway - Left here in case it proves useful + //---------------------------------------------------------------------------------------------------- + if ( $this->_mode == 'test' ) { + $query = "SELECT MAX(trxn_id) FROM civicrm_contribution WHERE trxn_id LIKE 'test%'"; + $p = array( ); + $trxn_id = strval( CRM_Core_Dao::singleValueQuery( $query, $p ) ); + $trxn_id = str_replace( 'test', '', $trxn_id ); + $trxn_id = intval($trxn_id) + 1; + $params['trxn_id'] = sprintf('test%08d', $trxn_id); + } + else { + $params['trxn_id'] = $eWAYResponse->TransactionNumber(); + } + */ //============= // Success ! diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php index b506e45202..55cb7f856b 100644 --- a/CRM/Core/Resources.php +++ b/CRM/Core/Resources.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 | +--------------------------------------------------------------------+ -*/ + */ /** * This class facilitates the loading of resources diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php index 30a57a1b58..40d983c454 100644 --- a/CRM/Core/SelectValues.php +++ b/CRM/Core/SelectValues.php @@ -707,16 +707,16 @@ class CRM_Core_SelectValues { ); /* - Year greater than 2000 get wrong result for following format - echo date( 'Y-m-d', strtotime( '7 Nov, 2001') ); - echo date( 'Y-m-d', strtotime( '7 November, 2001') ); - Return current year - expected :: 2001-11-07 - output :: 2009-11-07 - However - echo date( 'Y-m-d', strtotime( 'Nov 7, 2001') ); - echo date( 'Y-m-d', strtotime( 'November 7, 2001') ); - gives proper result + Year greater than 2000 get wrong result for following format + echo date( 'Y-m-d', strtotime( '7 Nov, 2001') ); + echo date( 'Y-m-d', strtotime( '7 November, 2001') ); + Return current year + expected :: 2001-11-07 + output :: 2009-11-07 + However + echo date( 'Y-m-d', strtotime( 'Nov 7, 2001') ); + echo date( 'Y-m-d', strtotime( 'November 7, 2001') ); + gives proper result */ return $dateInputFormats; diff --git a/CRM/Custom/Form/CustomData.php b/CRM/Custom/Form/CustomData.php index 62271ff844..844229ac8b 100644 --- a/CRM/Custom/Form/CustomData.php +++ b/CRM/Custom/Form/CustomData.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/Custom/Import/Parser.php b/CRM/Custom/Import/Parser.php index d31000d967..2b879c15cd 100644 --- a/CRM/Custom/Import/Parser.php +++ b/CRM/Custom/Import/Parser.php @@ -214,7 +214,7 @@ abstract class CRM_Custom_Import_Parser extends CRM_Contact_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/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php b/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php index 4009c78a03..3199da0aea 100644 --- a/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php +++ b/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.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 | +--------------------------------------------------------------------+ -*/ + */ /** * Class CRM_Dedupe_BAO_QueryBuilder_IndividualUnsupervised diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php index 89d2a46259..6a7097e4ed 100644 --- a/CRM/Event/BAO/Participant.php +++ b/CRM/Event/BAO/Participant.php @@ -24,7 +24,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -752,27 +752,27 @@ GROUP BY participant.event_id 'type' => CRM_Utils_Type::T_STRING, )); - $participantStatus = array( + $participantStatus = array( 'participant_status' => array( 'title' => 'Participant Status', 'name' => 'participant_status', 'type' => CRM_Utils_Type::T_STRING, )); - $participantRole = array( + $participantRole = array( 'participant_role' => array( 'title' => 'Participant Role', 'name' => 'participant_role', 'type' => CRM_Utils_Type::T_STRING, )); - $discountFields = CRM_Core_DAO_Discount::export(); + $discountFields = CRM_Core_DAO_Discount::export(); - $fields = array_merge($participantFields, $participantStatus, $participantRole, $eventFields, $noteField, $discountFields); + $fields = array_merge($participantFields, $participantStatus, $participantRole, $eventFields, $noteField, $discountFields); - // add custom data - $fields = array_merge($fields, CRM_Core_BAO_CustomField::getFieldsForImport('Participant')); - self::$_exportableFields = $fields; + // add custom data + $fields = array_merge($fields, CRM_Core_BAO_CustomField::getFieldsForImport('Participant')); + self::$_exportableFields = $fields; } return self::$_exportableFields; diff --git a/CRM/Event/Badge.php b/CRM/Event/Badge.php index 176f9fa688..e837cec3a0 100644 --- a/CRM/Event/Badge.php +++ b/CRM/Event/Badge.php @@ -24,10 +24,10 @@ */ /* -* Copyright (C) 2010 Tech To The People -* Licensed to CiviCRM under the Academic Free License version 3.0. -* -*/ + * Copyright (C) 2010 Tech To The People + * Licensed to CiviCRM under the Academic Free License version 3.0. + * + */ /** * diff --git a/CRM/Event/Badge/NameTent.php b/CRM/Event/Badge/NameTent.php index 32ed32b1db..ea0076f5be 100644 --- a/CRM/Event/Badge/NameTent.php +++ b/CRM/Event/Badge/NameTent.php @@ -27,10 +27,10 @@ /* -* Copyright (C) 2010 Tech To The People -* Licensed to CiviCRM under the Academic Free License version 3.0. -* -*/ + * Copyright (C) 2010 Tech To The People + * Licensed to CiviCRM under the Academic Free License version 3.0. + * + */ /** * diff --git a/CRM/Event/Badge/Simple.php b/CRM/Event/Badge/Simple.php index a2f2011b2f..aea188f16d 100644 --- a/CRM/Event/Badge/Simple.php +++ b/CRM/Event/Badge/Simple.php @@ -27,10 +27,10 @@ /* -* Copyright (C) 2010 Tech To The People -* Licensed to CiviCRM under the Academic Free License version 3.0. -* -*/ + * Copyright (C) 2010 Tech To The People + * Licensed to CiviCRM under the Academic Free License version 3.0. + * + */ /** * diff --git a/CRM/Event/Cart/BAO/MerParticipant.php b/CRM/Event/Cart/BAO/MerParticipant.php index 548a79a7ef..34aba376d8 100644 --- a/CRM/Event/Cart/BAO/MerParticipant.php +++ b/CRM/Event/Cart/BAO/MerParticipant.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 | +--------------------------------------------------------------------+ -*/ + */ /** * Class CRM_Event_Cart_BAO_MerParticipant diff --git a/CRM/Event/Form/Registration.php b/CRM/Event/Form/Registration.php index 81b4b7bc17..dba9b6bf57 100644 --- a/CRM/Event/Form/Registration.php +++ b/CRM/Event/Form/Registration.php @@ -160,9 +160,9 @@ class CRM_Event_Form_Registration extends CRM_Core_Form { public $_pcpId; /* Is event already full. - * - * @var boolean - */ + * + * @var boolean + */ public $_isEventFull; diff --git a/CRM/Event/Import/Field.php b/CRM/Event/Import/Field.php index aa58dfb246..3025c3d5aa 100644 --- a/CRM/Event/Import/Field.php +++ b/CRM/Event/Import/Field.php @@ -114,7 +114,7 @@ class CRM_Event_Import_Field { case 'register_date': return CRM_Utils_Rule::date($this->_value); - /* + /* @codingStandardsIgnoreStart case 'event_id': static $events = null; if (!$events) { @@ -127,7 +127,7 @@ class CRM_Event_Import_Field { return false; } break; - */ + @codingStandardsIgnoreEnd */ default: break; diff --git a/CRM/Event/Import/Parser.php b/CRM/Event/Import/Parser.php index 62fffd9ded..c23f159b7f 100644 --- a/CRM/Event/Import/Parser.php +++ b/CRM/Event/Import/Parser.php @@ -215,7 +215,7 @@ abstract class CRM_Event_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/Extension/Mapper.php b/CRM/Extension/Mapper.php index 018f50025b..0b1afae811 100755 --- a/CRM/Extension/Mapper.php +++ b/CRM/Extension/Mapper.php @@ -393,7 +393,7 @@ class CRM_Extension_Mapper { $pathElm = explode(DIRECTORY_SEPARATOR, $path); array_pop($pathElm); return implode(DIRECTORY_SEPARATOR, $pathElm) . DIRECTORY_SEPARATOR . self::EXT_TEMPLATES_DIRNAME; - */ + */ } /** diff --git a/CRM/Mailing/Event/BAO/TrackableURLOpen.php b/CRM/Mailing/Event/BAO/TrackableURLOpen.php index 1f8c3a55bd..dcadfa6bd5 100755 --- a/CRM/Mailing/Event/BAO/TrackableURLOpen.php +++ b/CRM/Mailing/Event/BAO/TrackableURLOpen.php @@ -58,7 +58,7 @@ class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_Track $search = new CRM_Mailing_BAO_TrackableURL(); /* To find the url, we also join on the queue and job tables. This - * prevents foreign key violations. */ + * prevents foreign key violations. */ $job = CRM_Mailing_BAO_MailingJob::getTableName(); $eq = CRM_Mailing_Event_BAO_Queue::getTableName(); diff --git a/CRM/Mailing/Event/BAO/Unsubscribe.php b/CRM/Mailing/Event/BAO/Unsubscribe.php index ba72b40f79..da8f6d03b7 100755 --- a/CRM/Mailing/Event/BAO/Unsubscribe.php +++ b/CRM/Mailing/Event/BAO/Unsubscribe.php @@ -174,7 +174,7 @@ WHERE email = %2 ); /* Make a list of groups and a list of prior mailings that received - * this mailing */ + * this mailing */ $groups = array(); $base_groups = array(); @@ -195,7 +195,7 @@ WHERE email = %2 } /* As long as we have prior mailings, find their groups and add to the - * list */ + * list */ while (!empty($mailings)) { $do->query(" @@ -223,8 +223,8 @@ WHERE email = %2 CRM_Utils_Hook::unsubscribeGroups('unsubscribe', $mailing_id, $contact_id, $group_ids, $base_group_ids); /* Now we have a complete list of recipient groups. Filter out all - * those except smart groups, those that the contact belongs to and - * base groups from search based mailings */ + * those except smart groups, those that the contact belongs to and + * base groups from search based mailings */ $baseGroupClause = ''; if (!empty($base_group_ids)) { diff --git a/CRM/Mailing/Form/ForwardMailing.php b/CRM/Mailing/Form/ForwardMailing.php index 60b4dede34..f5d1b18aed 100644 --- a/CRM/Mailing/Form/ForwardMailing.php +++ b/CRM/Mailing/Form/ForwardMailing.php @@ -61,7 +61,7 @@ class CRM_Mailing_Form_ForwardMailing extends CRM_Core_Form { } /* Show the subject instead of the name here, since it's being - * displayed to external contacts/users */ + * displayed to external contacts/users */ CRM_Utils_System::setTitle(ts('Forward Mailing: %1', array(1 => $mailing->subject))); diff --git a/CRM/Mailing/Form/Upload.php b/CRM/Mailing/Form/Upload.php index e47776c792..ff7833e627 100644 --- a/CRM/Mailing/Form/Upload.php +++ b/CRM/Mailing/Form/Upload.php @@ -637,7 +637,7 @@ class CRM_Mailing_Form_Upload extends CRM_Core_Form { } /* Do a full token replacement on a dummy verp, the current - * contact and domain, and the first organization. */ + * contact and domain, and the first organization. */ // here we make a dummy mailing object so that we // can retrieve the tokens that we need to replace diff --git a/CRM/Member/Import/Parser.php b/CRM/Member/Import/Parser.php index 33d2182eb7..335458f624 100644 --- a/CRM/Member/Import/Parser.php +++ b/CRM/Member/Import/Parser.php @@ -208,7 +208,7 @@ abstract class CRM_Member_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/Member/Page/DashBoard.php b/CRM/Member/Page/DashBoard.php index 5b2da66df0..8186bcb800 100644 --- a/CRM/Member/Page/DashBoard.php +++ b/CRM/Member/Page/DashBoard.php @@ -181,7 +181,8 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page { $status = CRM_Member_BAO_MembershipStatus::getMembershipStatusCurrent(); $status = implode(',', $status); - /* Disabled for lack of appropriate search + /*@codingStandardsIgnoreStart + Disabled for lack of appropriate search The Membership search isn't able to properly filter by join or renewal events. Until that works properly, the subtotals shouldn't get links. @@ -254,7 +255,7 @@ class CRM_Member_Page_DashBoard extends CRM_Core_Page { } } } - */ + @codingStandardsIgnoreEnd */ // Temporary replacement for current totals column diff --git a/CRM/Pledge/Form/Search.php b/CRM/Pledge/Form/Search.php index eb7950b083..5845128b23 100644 --- a/CRM/Pledge/Form/Search.php +++ b/CRM/Pledge/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/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php index e421ed7a7e..b837aedd1f 100644 --- a/CRM/Price/BAO/PriceField.php +++ b/CRM/Price/BAO/PriceField.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/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php index e7fcfd1b5f..494530164c 100644 --- a/CRM/Price/BAO/PriceSet.php +++ b/CRM/Price/BAO/PriceSet.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/Price/Form/Option.php b/CRM/Price/Form/Option.php index c5837ac193..8947d88306 100644 --- a/CRM/Price/Form/Option.php +++ b/CRM/Price/Form/Option.php @@ -196,11 +196,11 @@ class CRM_Price_Form_Option extends CRM_Core_Form { //CRM_Core_DAO::getFieldValue( 'CRM_Price_DAO_PriceField', $this->_fid, 'weight', 'id' ); // FIX ME: duplicate rule? /* - $this->addRule( 'label', - ts('Duplicate option label.'), - 'optionExists', - array( 'CRM_Core_DAO_OptionValue', $this->_oid, $this->_ogId, 'label' ) ); - */ + $this->addRule( 'label', + ts('Duplicate option label.'), + 'optionExists', + array( 'CRM_Core_DAO_OptionValue', $this->_oid, $this->_ogId, 'label' ) ); + */ // value $this->add('text', 'amount', ts('Option Amount'), NULL, TRUE); diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index 2e1861abe0..995ec03b28 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.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 | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -427,14 +427,14 @@ class CRM_Report_Form extends CRM_Core_Form { 'force', 'Boolean', CRM_Core_DAO::$_nullObject - ); + ); $this->_dashBoardRowCount = CRM_Utils_Request::retrieve( 'rowCount', 'Integer', CRM_Core_DAO::$_nullObject - ); + ); $this->_section = CRM_Utils_Request::retrieve('section', 'Integer', CRM_Core_DAO::$_nullObject); diff --git a/CRM/Report/Form/Case/Demographics.php b/CRM/Report/Form/Case/Demographics.php index 01c86d40ee..7a5c02cc48 100644 --- a/CRM/Report/Form/Case/Demographics.php +++ b/CRM/Report/Form/Case/Demographics.php @@ -125,7 +125,7 @@ class CRM_Report_Form_Case_Demographics extends CRM_Report_Form { 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_PseudoConstant::stateProvince( ), ), ), - */ + */ ), 'civicrm_phone' => array( 'dao' => 'CRM_Core_DAO_Phone', diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php index 17d0f94aba..e9badb2211 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -827,9 +827,9 @@ WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribu } /* Group (un-limited) report by all aliases and get counts. This might - * be done more efficiently when the contents of $sql are known, ie. by - * overriding this method in the report class. - */ + * be done more efficiently when the contents of $sql are known, ie. by + * overriding this method in the report class. + */ $addtotals = ''; diff --git a/CRM/Report/Form/Event/ParticipantListCount.php b/CRM/Report/Form/Event/ParticipantListCount.php index 2fffa03936..f81fadc160 100644 --- a/CRM/Report/Form/Event/ParticipantListCount.php +++ b/CRM/Report/Form/Event/ParticipantListCount.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/Report/Form/Event/ParticipantListing.php b/CRM/Report/Form/Event/ParticipantListing.php index a8ab64c0a0..418ee97507 100644 --- a/CRM/Report/Form/Event/ParticipantListing.php +++ b/CRM/Report/Form/Event/ParticipantListing.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/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php index d08760041f..d301c8ce95 100644 --- a/CRM/Report/Form/Member/ContributionDetail.php +++ b/CRM/Report/Form/Member/ContributionDetail.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/SMS/Form/Upload.php b/CRM/SMS/Form/Upload.php index f1ad983c3d..565182bae9 100644 --- a/CRM/SMS/Form/Upload.php +++ b/CRM/SMS/Form/Upload.php @@ -378,7 +378,7 @@ class CRM_SMS_Form_Upload extends CRM_Core_Form { $dataErrors = array(); /* Do a full token replacement on a dummy verp, the current - * contact and domain, and the first organization. */ + * contact and domain, and the first organization. */ // here we make a dummy mailing object so that we // can retrieve the tokens that we need to replace diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index a510fb2f27..6f40d682b1 100644 --- a/CRM/Upgrade/Form.php +++ b/CRM/Upgrade/Form.php @@ -360,7 +360,7 @@ SET version = '$version' // sample test list /* $revList = array( - '2.1.0', '2.2.beta2', '2.2.beta1', '2.2.alpha1', */ + '2.1.0', '2.2.beta2', '2.2.beta1', '2.2.alpha1', */ /* '2.2.alpha3', '2.2.0', '2.2.2', '2.1.alpha1', '2.1.3'); */ diff --git a/CRM/Utils/Cache/SerializeCache.php b/CRM/Utils/Cache/SerializeCache.php index bcdf686046..4ea0fe7bc5 100644 --- a/CRM/Utils/Cache/SerializeCache.php +++ b/CRM/Utils/Cache/SerializeCache.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 | +--------------------------------------------------------------------+ -*/ + */ /** * Class CRM_Utils_Cache_SerializeCache diff --git a/CRM/Utils/Date.php b/CRM/Utils/Date.php index a456f45386..1c4dc6e03c 100644 --- a/CRM/Utils/Date.php +++ b/CRM/Utils/Date.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 | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -1729,14 +1729,14 @@ class CRM_Utils_Date { // 'm/d/Y' format. So that submitted value is alwats mm/dd/YY format // note that for date display we dynamically create text field /* - if ( !$format ) { - $format = $config->dateInputFormat; - } + if ( !$format ) { + $format = $config->dateInputFormat; + } - // get actual format - $actualPHPFormats = CRM_Core_SelectValues::datePluginToPHPFormats( ); - $dateFormat = CRM_Utils_Array::value( $format, $actualPHPFormats ); - */ + // get actual format + $actualPHPFormats = CRM_Core_SelectValues::datePluginToPHPFormats( ); + $dateFormat = CRM_Utils_Array::value( $format, $actualPHPFormats ); + */ $dateFormat = 'm/d/Y'; $date = date($dateFormat, strtotime($mysqlDate)); diff --git a/CRM/Utils/DeprecatedUtils.php b/CRM/Utils/DeprecatedUtils.php index 7ec295c8fc..d09734c486 100644 --- a/CRM/Utils/DeprecatedUtils.php +++ b/CRM/Utils/DeprecatedUtils.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 | +--------------------------------------------------------------------+ -*/ + */ /* * These functions have been deprecated out of API v3 Utils folder as they are not part of the @@ -764,18 +764,18 @@ function _civicrm_api3_deprecated_activity_formatted_param(&$params, &$values, $ */ function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params) { /* Crawl through the possible classes: - * Contact - * Individual - * Household - * Organization - * Location - * Address - * Email - * Phone - * IM - * Note - * Custom - */ + * Contact + * Individual + * Household + * Organization + * Location + * Address + * Email + * Phone + * IM + * Note + * Custom + */ /* Cache the various object fields */ static $fields = NULL; diff --git a/CRM/Utils/Geocode/Google.php b/CRM/Utils/Geocode/Google.php index edc2deff4d..f224b63ec1 100644 --- a/CRM/Utils/Geocode/Google.php +++ b/CRM/Utils/Geocode/Google.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/Utils/Geocode/Yahoo.php b/CRM/Utils/Geocode/Yahoo.php index 6f57ef6526..e5e6344415 100644 --- a/CRM/Utils/Geocode/Yahoo.php +++ b/CRM/Utils/Geocode/Yahoo.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 | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -185,11 +185,11 @@ class CRM_Utils_Geocode_Yahoo { $values['postal_code'] = $ret['postal']; /* the following logic to split the string was borrowed from - CRM/Core/BAO/Address.php -- CRM_Core_BAO_Address::fixAddress. - This is actually the function that calls the geocoding - script to begin with, but the postal code business takes - place before geocoding gets called. - */ + CRM/Core/BAO/Address.php -- CRM_Core_BAO_Address::fixAddress. + This is actually the function that calls the geocoding + script to begin with, but the postal code business takes + place before geocoding gets called. + */ if (preg_match('/^(\d{4,5})[+-](\d{4})$/', $ret['postal'], diff --git a/CRM/Utils/JS.php b/CRM/Utils/JS.php index 5e118c3c1e..5b7a3572e0 100644 --- a/CRM/Utils/JS.php +++ b/CRM/Utils/JS.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 | +--------------------------------------------------------------------+ -*/ + */ /** * Parse Javascript content and extract translatable strings. diff --git a/CRM/Utils/Rule.php b/CRM/Utils/Rule.php index 335eea5af1..30d49df23a 100644 --- a/CRM/Utils/Rule.php +++ b/CRM/Utils/Rule.php @@ -429,7 +429,8 @@ class CRM_Utils_Rule { 'currency', array( 'keyColumn' => 'name', 'labelColumn' => 'symbol', - )); + ) + ); $value = str_replace($currencySymbols, '', $value); if ($config->monetaryThousandSeparator) { diff --git a/CRM/Utils/String.php b/CRM/Utils/String.php index cccb85e88c..08d2470716 100644 --- a/CRM/Utils/String.php +++ b/CRM/Utils/String.php @@ -319,9 +319,9 @@ class CRM_Utils_String { $str = preg_replace('/\s+/', '', $str); /* pattern stolen from the php.net function documentation for - * utf8decode(); - * comment by JF Sebastian, 30-Mar-2005 - */ + * utf8decode(); + * comment by JF Sebastian, 30-Mar-2005 + */ return preg_match('/^([\x00-\x7f]|[\xc2-\xdf][\x80-\xbf]|\xe0[\xa0-\xbf][\x80-\xbf]|[\xe1-\xec][\x80-\xbf]{2}|\xed[\x80-\x9f][\x80-\xbf]|[\xee-\xef][\x80-\xbf]{2}|f0[\x90-\xbf][\x80-\xbf]{2}|[\xf1-\xf3][\x80-\xbf]{3}|\xf4[\x80-\x8f][\x80-\xbf]{2})*$/', $str); // || diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php index 670b13f338..c79ff64111 100644 --- a/CRM/Utils/System/Drupal.php +++ b/CRM/Utils/System/Drupal.php @@ -72,10 +72,10 @@ class CRM_Utils_System_Drupal extends CRM_Utils_System_DrupalBase { $form_state['method'] = 'post'; $form_state['build_info']['args'] = array(); /* - * if we want to submit this form more than once in a process (e.g. create more than one user) - * we must force it to validate each time for this form. Otherwise it will not validate - * subsequent submissions and the manner in which the password is passed in will be invalid - */ + * if we want to submit this form more than once in a process (e.g. create more than one user) + * we must force it to validate each time for this form. Otherwise it will not validate + * subsequent submissions and the manner in which the password is passed in will be invalid + */ $form_state['must_validate'] = TRUE; $config = CRM_Core_Config::singleton(); diff --git a/CRM/Utils/System/Drupal6.php b/CRM/Utils/System/Drupal6.php index df3a1a7131..78727b27ba 100644 --- a/CRM/Utils/System/Drupal6.php +++ b/CRM/Utils/System/Drupal6.php @@ -878,12 +878,13 @@ class CRM_Utils_System_Drupal6 extends CRM_Utils_System_DrupalBase { $perms = $perms + drupal_map_assoc($newPerms); $permList = implode(', ', $perms); db_query('UPDATE {permission} SET perm = "%s" WHERE rid = %d', $permList, $rid); - /* + /* @codingStandardsIgnoreStart if ( ! empty( $roles ) ) { $rids = implode(',', array_keys($roles)); db_query( 'UPDATE {permission} SET perm = CONCAT( perm, \', edit all events\') WHERE rid IN (' . implode(',', array_keys($roles)) . ')' ); db_query( "UPDATE {permission} SET perm = REPLACE( perm, '%s', '%s' ) WHERE rid IN ($rids)", - $oldPerm, implode(', ', $newPerms) );*/ + $oldPerm, implode(', ', $newPerms) ); + @codingStandardsIgnoreEnd */ } } diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php index c92724294a..ae0b29f170 100644 --- a/CRM/Utils/Token.php +++ b/CRM/Utils/Token.php @@ -592,7 +592,7 @@ class CRM_Utils_Token { $escapeSmarty = FALSE ) { /* If the token is an email action, use it. Otherwise, find the - * appropriate URL */ + * appropriate URL */ if (!in_array($token, self::$_tokens['action'])) { $value = "{action.$token}"; diff --git a/CRM/Utils/Weight.php b/CRM/Utils/Weight.php index 305f28d412..976c5bd46e 100644 --- a/CRM/Utils/Weight.php +++ b/CRM/Utils/Weight.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 | +--------------------------------------------------------------------+ -*/ + */ /** * Class CRM_Utils_Weight diff --git a/api/v3/Case.php b/api/v3/Case.php index 28ff9898c4..c8aa5ca9a7 100644 --- a/api/v3/Case.php +++ b/api/v3/Case.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 | +--------------------------------------------------------------------+ -*/ + */ /** * File for the CiviCRM APIv3 Case functions diff --git a/api/v3/CaseType.php b/api/v3/CaseType.php index c165555f11..3d00eca7af 100644 --- a/api/v3/CaseType.php +++ b/api/v3/CaseType.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 | +--------------------------------------------------------------------+ -*/ + */ /** * File for the CiviCRM APIv3 Case functions diff --git a/api/v3/Contact.php b/api/v3/Contact.php index bb31c023a8..fed2bca617 100644 --- a/api/v3/Contact.php +++ b/api/v3/Contact.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 | +--------------------------------------------------------------------+ -*/ + */ /** * new version of civicrm apis. See blog post at diff --git a/api/v3/Domain.php b/api/v3/Domain.php index e06da42811..c8cf7f9121 100644 --- a/api/v3/Domain.php +++ b/api/v3/Domain.php @@ -86,11 +86,11 @@ function civicrm_api3_domain_get($params) { CRM_Utils_Array::value( 'phone_type_id', $values['location']['phone'][1] - ) + ) ), 'phone' => CRM_Utils_Array::value( 'phone', - $values['location']['phone'][1] + $values['location']['phone'][1] ), ); } diff --git a/api/v3/Generic/Getactions.php b/api/v3/Generic/Getactions.php index c4a5f7829e..d8b7fb4adb 100644 --- a/api/v3/Generic/Getactions.php +++ b/api/v3/Generic/Getactions.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 | +--------------------------------------------------------------------+ -*/ + */ /** * @param array $apiRequest diff --git a/api/v3/Generic/Getlist.php b/api/v3/Generic/Getlist.php index c17d510972..aee2a58c13 100644 --- a/api/v3/Generic/Getlist.php +++ b/api/v3/Generic/Getlist.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 | +--------------------------------------------------------------------+ -*/ + */ /** * Generic api wrapper used for quicksearch and autocomplete * diff --git a/api/v3/MessageTemplate.php b/api/v3/MessageTemplate.php index fb17f98307..b2ca5e145a 100644 --- a/api/v3/MessageTemplate.php +++ b/api/v3/MessageTemplate.php @@ -53,7 +53,7 @@ function _civicrm_api3_message_template_create_spec(&$params) { /* $params['entity_id']['api.required'] = 1; $params['entity_table']['api.default'] = "civicrm_contribution_recur"; $params['type']['api.default'] = "R"; - */ + */ } /** diff --git a/api/v3/Profile.php b/api/v3/Profile.php index d93beafaea..034b12b36b 100644 --- a/api/v3/Profile.php +++ b/api/v3/Profile.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 | +--------------------------------------------------------------------+ -*/ + */ /** * File for the CiviCRM APIv3 activity profile functions diff --git a/api/v3/ReportTemplate.php b/api/v3/ReportTemplate.php index ee4c608ba1..8fa00c97b8 100644 --- a/api/v3/ReportTemplate.php +++ b/api/v3/ReportTemplate.php @@ -173,7 +173,7 @@ function _civicrm_api3_report_template_getrows_spec(&$params) { ); } -/* +/* @codingStandardsIgnoreStart function civicrm_api3_report_template_getfields($params) { return civicrm_api3_create_success(array( 'id' => array( @@ -270,4 +270,5 @@ function civicrm_api3_report_template_getfields($params) { 'default' => 'UL', ), )); -}*/ +} +@codingStandardsIgnoreEnd */ diff --git a/api/v3/utils.php b/api/v3/utils.php index 41ca0a5a8d..c2ada33f33 100644 --- a/api/v3/utils.php +++ b/api/v3/utils.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 | +--------------------------------------------------------------------+ -*/ + */ /** * File for CiviCRM APIv3 utilitity functions diff --git a/tests/phpunit/CRM/Contact/BAO/ContactTest.php b/tests/phpunit/CRM/Contact/BAO/ContactTest.php index d014584a23..8e8526a0f1 100644 --- a/tests/phpunit/CRM/Contact/BAO/ContactTest.php +++ b/tests/phpunit/CRM/Contact/BAO/ContactTest.php @@ -1413,8 +1413,8 @@ class CRM_Contact_BAO_ContactTest extends CiviUnitTestCase { 'contact_type' => 'Individual', 'contact_id' => $contactId, ); - $contact = CRM_Contact_BAO_Contact::add($params); - $test->assertInstanceOf('CRM_Contact_DAO_Contact', $contact, 'Check for created object'); + $contact = CRM_Contact_BAO_Contact::add($params); + $test->assertInstanceOf('CRM_Contact_DAO_Contact', $contact, 'Check for created object'); }, )); } diff --git a/tests/phpunit/CRM/Core/BAO/SettingTest.php b/tests/phpunit/CRM/Core/BAO/SettingTest.php index 03b18f629d..13a67d73ca 100644 --- a/tests/phpunit/CRM/Core/BAO/SettingTest.php +++ b/tests/phpunit/CRM/Core/BAO/SettingTest.php @@ -113,9 +113,7 @@ class CRM_Core_BAO_SettingTest extends CiviUnitTestCase { * 2) for current domain setting max_attachments is set to the value that $config->maxAttachments * had (6) * 3) for other domain (2) max_attachments is set to the configured default (3) - * - * - **/ + */ public function testConvertAndFillSettings() { $settings = array('maxAttachments' => 6); CRM_Core_BAO_ConfigSetting::add($settings); @@ -179,10 +177,10 @@ class CRM_Core_BAO_SettingTest extends CiviUnitTestCase { $this->assertEmpty($maxAttachments); } - /* + /* @codingStandardsIgnoreStart * Check that setting is converted without config value being removed * - public function testConvertConfigToSettingPrefetch() { + public function testConvertConfigToSettingPrefetch() { $settings = array('debug' => 1); CRM_Core_BAO_ConfigSetting::add($settings); $config = CRM_Core_Config::singleton(true, true); @@ -194,7 +192,7 @@ class CRM_Core_BAO_SettingTest extends CiviUnitTestCase { $config = CRM_Core_Config::singleton(true, true); $this->assertEmpty($config->debug); } - */ + @codingStandardsIgnoreEnd */ /** * Ensure that on_change callbacks fire. diff --git a/tests/phpunit/CRM/Core/JobManagerTest.php b/tests/phpunit/CRM/Core/JobManagerTest.php index 2497b9416c..db27dd8fba 100644 --- a/tests/phpunit/CRM/Core/JobManagerTest.php +++ b/tests/phpunit/CRM/Core/JobManagerTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; /** diff --git a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php index 95d3825c39..4e07c27641 100644 --- a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php +++ b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php @@ -354,7 +354,7 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase { $this->assertFalse(is_array($result)); } - /* + /* @codingStandardsIgnoreStart * Test calls main functions in sequence per 'main' - I had hoped to test the functions more * fully but the calls to the POST happen in more than one function * keeping this as good example of data to bring back to life later @@ -429,6 +429,7 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase { return $this->IPN->recur( $input, $ids, $objects, $first ); } } + @codingStandardsIgnoreEnd */ /** * Prepare for contribution Test - involving only contribution objects diff --git a/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php b/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php index f90addab45..c7fd9b1e5a 100644 --- a/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php +++ b/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license UAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/CRM/Extension/Container/CollectionTest.php b/tests/phpunit/CRM/Extension/Container/CollectionTest.php index 96616405ad..366ebdce96 100644 --- a/tests/phpunit/CRM/Extension/Container/CollectionTest.php +++ b/tests/phpunit/CRM/Extension/Container/CollectionTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; /** diff --git a/tests/phpunit/CRM/Extension/Manager/PaymentTest.php b/tests/phpunit/CRM/Extension/Manager/PaymentTest.php index 77822d8e41..6910d32c50 100644 --- a/tests/phpunit/CRM/Extension/Manager/PaymentTest.php +++ b/tests/phpunit/CRM/Extension/Manager/PaymentTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; /** diff --git a/tests/phpunit/CRM/Extension/ManagerTest.php b/tests/phpunit/CRM/Extension/ManagerTest.php index fce0bc63cc..9124027c88 100644 --- a/tests/phpunit/CRM/Extension/ManagerTest.php +++ b/tests/phpunit/CRM/Extension/ManagerTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; /** diff --git a/tests/phpunit/CRM/Extension/MapperTest.php b/tests/phpunit/CRM/Extension/MapperTest.php index 8c78fa5d70..c6cd4966c4 100644 --- a/tests/phpunit/CRM/Extension/MapperTest.php +++ b/tests/phpunit/CRM/Extension/MapperTest.php @@ -83,12 +83,12 @@ class CRM_Extension_MapperTest extends CiviUnitTestCase { public function _createContainer(CRM_Utils_Cache_Interface $cache = NULL, $cacheKey = NULL, $appendPathGarbage = '') { /* $container = new CRM_Extension_Container_Static(array( - 'test.foo.bar' => array( - 'path' => '/path/to/test.foo.bar', - 'resUrl' => 'http://resources/test.foo.bar', - ), + 'test.foo.bar' => array( + 'path' => '/path/to/test.foo.bar', + 'resUrl' => 'http://resources/test.foo.bar', + ), )); - */ + */ $basedir = rtrim($this->createTempDir('ext-'), '/'); mkdir("$basedir/weird"); mkdir("$basedir/weird/foobar"); diff --git a/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php b/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php index d9aafca137..2b25bb6b3e 100644 --- a/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php +++ b/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php @@ -138,16 +138,16 @@ class CRM_Member_Import_Parser_MembershipTest extends CiviUnitTestCase { /* $params = array( - 'contact_id' => $contactId, - 'membership_type_id' => $this->_membershipTypeID, - 'join_date' => '2006-01-21', - 'start_date' => '2006-01-21', - 'end_date' => '2006-12-21', - 'source' => 'Payment', - 'is_override' => 1, - 'status_id' => $this->_mebershipStatusID, + 'contact_id' => $contactId, + 'membership_type_id' => $this->_membershipTypeID, + 'join_date' => '2006-01-21', + 'start_date' => '2006-01-21', + 'end_date' => '2006-12-21', + 'source' => 'Payment', + 'is_override' => 1, + 'status_id' => $this->_mebershipStatusID, ); - */ + */ $importObject = new CRM_Member_Import_Parser_Membership($fieldMapper); $importObject->init(); $importObject->_contactType = 'Individual'; diff --git a/tests/phpunit/CRM/Utils/JSTest.php b/tests/phpunit/CRM/Utils/JSTest.php index d38456a91c..43e7720065 100644 --- a/tests/phpunit/CRM/Utils/JSTest.php +++ b/tests/phpunit/CRM/Utils/JSTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/CRM/Utils/Migrate/ImportExportTest.php b/tests/phpunit/CRM/Utils/Migrate/ImportExportTest.php index e88892a1bf..f448598500 100644 --- a/tests/phpunit/CRM/Utils/Migrate/ImportExportTest.php +++ b/tests/phpunit/CRM/Utils/Migrate/ImportExportTest.php @@ -82,7 +82,7 @@ class CRM_Utils_Migrate_ImportExportTest extends CiviUnitTestCase { __DIR__ . '/fixtures/Contact-text.xml', ); - /* + /* @codingStandardsIgnoreStart $cases[] = array( // CustomGroup params array( @@ -94,7 +94,7 @@ class CRM_Utils_Migrate_ImportExportTest extends CiviUnitTestCase { // expectedXmlFilePath __DIR__ . '/fixtures/Contact-select.xml', ); - */ + @codingStandardsIgnoreEnd */ $cases[] = array( // CustomGroup params diff --git a/tests/phpunit/CRM/Utils/SignerTest.php b/tests/phpunit/CRM/Utils/SignerTest.php index f5bdb491f0..919ecd9ca0 100644 --- a/tests/phpunit/CRM/Utils/SignerTest.php +++ b/tests/phpunit/CRM/Utils/SignerTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; /** diff --git a/tests/phpunit/CRM/Utils/ZipTest.php b/tests/phpunit/CRM/Utils/ZipTest.php index 1201c9cdab..1361508dae 100644 --- a/tests/phpunit/CRM/Utils/ZipTest.php +++ b/tests/phpunit/CRM/Utils/ZipTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; /** diff --git a/tests/phpunit/CiviTest/bootstrap.php b/tests/phpunit/CiviTest/bootstrap.php index 2ec2354a06..e23312f52c 100644 --- a/tests/phpunit/CiviTest/bootstrap.php +++ b/tests/phpunit/CiviTest/bootstrap.php @@ -27,7 +27,7 @@ require_once $GLOBALS['base_dir'] . '/vendor/autoload.php'; /* require $GLOBALS['base_dir'] . DIRECTORY_SEPARATOR . - 'packages' . DIRECTORY_SEPARATOR . - 'PHPUnit' . DIRECTORY_SEPARATOR . - 'Autoload.php'; -*/ +'packages' . DIRECTORY_SEPARATOR . +'PHPUnit' . DIRECTORY_SEPARATOR . +'Autoload.php'; + */ diff --git a/tests/phpunit/WebTest/Contact/MergeContactsTest.php b/tests/phpunit/WebTest/Contact/MergeContactsTest.php index bfbc7468be..79e736f0de 100644 --- a/tests/phpunit/WebTest/Contact/MergeContactsTest.php +++ b/tests/phpunit/WebTest/Contact/MergeContactsTest.php @@ -600,7 +600,8 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase { $this->assertTrue( (bool) preg_match("/^This will run the batch merge process on the listed duplicates. The operation will run in safe mode - only records with no direct data conflicts will be merged. Click OK to proceed if you are sure you wish to run this operation./", $this->getConfirmation() - )); + ) + ); $this->chooseOkOnNextConfirmation(); $this->waitForPageToLoad($this->getTimeoutMsec()); $this->waitForElementPresent('civicrm-footer'); diff --git a/tests/phpunit/WebTest/Contribute/VerifySSLContributionTest.php b/tests/phpunit/WebTest/Contribute/VerifySSLContributionTest.php index d9b54d20c1..ba09a2c59e 100644 --- a/tests/phpunit/WebTest/Contribute/VerifySSLContributionTest.php +++ b/tests/phpunit/WebTest/Contribute/VerifySSLContributionTest.php @@ -45,8 +45,8 @@ class WebTest_Contribute_VerifySSLContributionTest extends CiviSeleniumTestCase // todo: write code to check other payment processors /*$this->_tryPaymentProcessor($this->names['Google_Checkout']); - $this->_tryPaymentProcessor($this->names['PayPal']); - $this->_tryPaymentProcessor($this->names['PayPal_Standard']);*/ + $this->_tryPaymentProcessor($this->names['PayPal']); + $this->_tryPaymentProcessor($this->names['PayPal_Standard']);*/ } public function _initialize() { diff --git a/tests/phpunit/WebTest/Event/ParticipantSearchTest.php b/tests/phpunit/WebTest/Event/ParticipantSearchTest.php index b361de38c3..b55a8202f5 100644 --- a/tests/phpunit/WebTest/Event/ParticipantSearchTest.php +++ b/tests/phpunit/WebTest/Event/ParticipantSearchTest.php @@ -22,7 +22,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviSeleniumTestCase.php'; diff --git a/tests/phpunit/WebTest/Import/MultipleRelationshipTest.php b/tests/phpunit/WebTest/Import/MultipleRelationshipTest.php index e806e7bceb..6b3f664b0c 100644 --- a/tests/phpunit/WebTest/Import/MultipleRelationshipTest.php +++ b/tests/phpunit/WebTest/Import/MultipleRelationshipTest.php @@ -22,7 +22,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ require_once 'WebTest/Import/ImportCiviSeleniumTestCase.php'; diff --git a/tests/phpunit/WebTest/Member/StandaloneAddTest.php b/tests/phpunit/WebTest/Member/StandaloneAddTest.php index ee90dff210..a1edcbceb2 100644 --- a/tests/phpunit/WebTest/Member/StandaloneAddTest.php +++ b/tests/phpunit/WebTest/Member/StandaloneAddTest.php @@ -250,7 +250,7 @@ class WebTest_Member_StandaloneAddTest extends CiviSeleniumTestCase { $test = $this; $this->customFieldSetLoadOnTheFlyCheck($customSets, $pageUrl, function () use ($test) { - $test->select('membership_type_id_0', 'value=1'); + $test->select('membership_type_id_0', 'value=1'); } ); } diff --git a/tests/phpunit/api/v3/APIStandardsTest.php b/tests/phpunit/api/v3/APIStandardsTest.php index fb2e596d0a..e8b5ff06db 100644 --- a/tests/phpunit/api/v3/APIStandardsTest.php +++ b/tests/phpunit/api/v3/APIStandardsTest.php @@ -98,9 +98,10 @@ class api_v3_APIStandardsTest extends CiviUnitTestCase { * the $params passed in is not an array. */ public function testParamsNotArray() { - /*I have commented this out as the check for is_array has been moved to civicrm_api. But keeping in place as - * this test, in contrast to the standards test, tests all existing API rather than just CRUD ones - * so want to keep code for re-use + /* @codingStandardsIgnoreStart + * I have commented this out as the check for is_array has been moved to civicrm_api. But keeping in place as + * this test, in contrast to the standards test, tests all existing API rather than just CRUD ones + * so want to keep code for re-use $files = $this->getAllFilesinAPIDir(); $this->assertGreaterThan(1, count($files),"something has gone wrong listing the files in line " . __LINE__); $this->requireOnceFilesArray($files); @@ -118,7 +119,8 @@ class api_v3_APIStandardsTest extends CiviUnitTestCase { continue; } - }*/ + } + @codingStandardsIgnoreEnd */ } /** diff --git a/tests/phpunit/api/v3/CampaignTest.php b/tests/phpunit/api/v3/CampaignTest.php index 623d530ffe..ed1a7194cd 100644 --- a/tests/phpunit/api/v3/CampaignTest.php +++ b/tests/phpunit/api/v3/CampaignTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/CustomFieldTest.php b/tests/phpunit/api/v3/CustomFieldTest.php index 8b9f054b31..de09416c29 100644 --- a/tests/phpunit/api/v3/CustomFieldTest.php +++ b/tests/phpunit/api/v3/CustomFieldTest.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 | +--------------------------------------------------------------------+ -*/ + */ /** * Include class definitions @@ -149,8 +149,8 @@ class api_v3_CustomFieldTest extends CiviUnitTestCase { } } /* - * Can't figure out the point of this? - */ + * Can't figure out the point of this? + */ /** * @param array $params */ @@ -170,14 +170,14 @@ class api_v3_CustomFieldTest extends CiviUnitTestCase { public function _buildParams($gid, $htype, $dtype) { $params = $this->_buildBasicParams($gid, $htype, $dtype); /* //Not Working for any type. Maybe redundant with testCustomFieldCreateWithOptionValues() - if ($htype == 'Multi-Select') - $params = array_merge($params, array( - 'option_label' => array( 'Label1','Label2'), - 'option_value' => array( 'val1', 'val2' ), - 'option_weight' => array( 1, 2), - 'option_status' => array( 1, 1), - )); - */ + if ($htype == 'Multi-Select') + $params = array_merge($params, array( + 'option_label' => array( 'Label1','Label2'), + 'option_value' => array( 'val1', 'val2' ), + 'option_weight' => array( 1, 2), + 'option_status' => array( 1, 1), + )); + */ return $params; } @@ -207,15 +207,15 @@ class api_v3_CustomFieldTest extends CiviUnitTestCase { * Test using example code */ /*function testCustomFieldCreateExample( ) - { + { - $customGroup = $this->customGroupCreate('Individual','date_test_group',3); - require_once 'api/v3/examples/CustomField/Create.php'; - $result = custom_field_create_example(); - $expectedResult = custom_field_create_expectedresult(); - $this->assertEquals($result,$expectedResult); - }*/ + $customGroup = $this->customGroupCreate('Individual','date_test_group',3); + require_once 'api/v3/examples/CustomField/Create.php'; + $result = custom_field_create_example(); + $expectedResult = custom_field_create_expectedresult(); + $this->assertEquals($result,$expectedResult); + }*/ /** * Check with data type - Options with option_values diff --git a/tests/phpunit/api/v3/DomainTest.php b/tests/phpunit/api/v3/DomainTest.php index 74a3224f90..cc78516e20 100644 --- a/tests/phpunit/api/v3/DomainTest.php +++ b/tests/phpunit/api/v3/DomainTest.php @@ -36,7 +36,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_DomainTest extends CiviUnitTestCase { /* This test case doesn't require DB reset - apart from - where cleanDB() is called. */ + where cleanDB() is called. */ public $DBResetRequired = FALSE; @@ -144,8 +144,8 @@ class api_v3_DomainTest extends CiviUnitTestCase { ///////////////// civicrm_domain_create methods /* - * This test checks for a memory leak observed when doing 2 gets on current domain - */ + * This test checks for a memory leak observed when doing 2 gets on current domain + */ public function testGetCurrentDomainTwice() { diff --git a/tests/phpunit/api/v3/EmailTest.php b/tests/phpunit/api/v3/EmailTest.php index 7e3a827f24..7f078339d6 100644 --- a/tests/phpunit/api/v3/EmailTest.php +++ b/tests/phpunit/api/v3/EmailTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/EventTest.php b/tests/phpunit/api/v3/EventTest.php index 197b1726ec..6b5f19dd90 100644 --- a/tests/phpunit/api/v3/EventTest.php +++ b/tests/phpunit/api/v3/EventTest.php @@ -175,13 +175,13 @@ class api_v3_EventTest extends CiviUnitTestCase { /* public function testGetIdOfEventByEventTitle() { - $params = array( 'title' => 'Annual CiviCRM meet', - 'return' => 'id' - ); + $params = array( 'title' => 'Annual CiviCRM meet', + 'return' => 'id' + ); - $result = $this->callAPISuccess('Event', 'Get', $params); + $result = $this->callAPISuccess('Event', 'Get', $params); } - */ + */ /** diff --git a/tests/phpunit/api/v3/LineItemTest.php b/tests/phpunit/api/v3/LineItemTest.php index a32a05db7c..2bc0244f49 100644 --- a/tests/phpunit/api/v3/LineItemTest.php +++ b/tests/phpunit/api/v3/LineItemTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/LocBlockTest.php b/tests/phpunit/api/v3/LocBlockTest.php index c3e66bb0e1..e4be275731 100644 --- a/tests/phpunit/api/v3/LocBlockTest.php +++ b/tests/phpunit/api/v3/LocBlockTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/MailSettingsTest.php b/tests/phpunit/api/v3/MailSettingsTest.php index 3e0cbf0c38..071e076357 100644 --- a/tests/phpunit/api/v3/MailSettingsTest.php +++ b/tests/phpunit/api/v3/MailSettingsTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/MailingGroupTest.php b/tests/phpunit/api/v3/MailingGroupTest.php index 7aed09fa63..d076c0bcca 100644 --- a/tests/phpunit/api/v3/MailingGroupTest.php +++ b/tests/phpunit/api/v3/MailingGroupTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/MembershipTypeTest.php b/tests/phpunit/api/v3/MembershipTypeTest.php index ec82781158..5ee2dd1b5f 100644 --- a/tests/phpunit/api/v3/MembershipTypeTest.php +++ b/tests/phpunit/api/v3/MembershipTypeTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/OptionGroupTest.php b/tests/phpunit/api/v3/OptionGroupTest.php index aab1ec7830..d2e12a3c3c 100644 --- a/tests/phpunit/api/v3/OptionGroupTest.php +++ b/tests/phpunit/api/v3/OptionGroupTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/OptionValueTest.php b/tests/phpunit/api/v3/OptionValueTest.php index 1e0b0e4158..c767a2318a 100644 --- a/tests/phpunit/api/v3/OptionValueTest.php +++ b/tests/phpunit/api/v3/OptionValueTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; @@ -241,7 +241,8 @@ class api_v3_OptionValueTest extends CiviUnitTestCase { 'option_group', 'get', array( 'name' => 'gender', 'sequential' => 1, - )); + ) + ); $this->assertAPISuccess($optionGroup); $params = array( 'option_group_id' => $optionGroup['id'], diff --git a/tests/phpunit/api/v3/ParticipantStatusTypeTest.php b/tests/phpunit/api/v3/ParticipantStatusTypeTest.php index 0c6c0bb1f5..7e32e85f60 100644 --- a/tests/phpunit/api/v3/ParticipantStatusTypeTest.php +++ b/tests/phpunit/api/v3/ParticipantStatusTypeTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/ParticipantTest.php b/tests/phpunit/api/v3/ParticipantTest.php index 828dc18540..afcf812390 100644 --- a/tests/phpunit/api/v3/ParticipantTest.php +++ b/tests/phpunit/api/v3/ParticipantTest.php @@ -521,7 +521,7 @@ class api_v3_ParticipantTest extends CiviUnitTestCase { $this->callAPISuccess('PriceFieldValue', 'delete', array('id' => $pfv2['id'])); $this->callAPISuccess('PriceField', 'delete', array('id' => $pricefield['id'])); $this->callAPISuccess('PriceSet', 'delete', array('id' => $priceset['id'])); - */ + */ } /** diff --git a/tests/phpunit/api/v3/PriceFieldTest.php b/tests/phpunit/api/v3/PriceFieldTest.php index e58c6f1656..eb96412640 100644 --- a/tests/phpunit/api/v3/PriceFieldTest.php +++ b/tests/phpunit/api/v3/PriceFieldTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/PriceFieldValueTest.php b/tests/phpunit/api/v3/PriceFieldValueTest.php index b6c12c62b4..3d87b19f71 100644 --- a/tests/phpunit/api/v3/PriceFieldValueTest.php +++ b/tests/phpunit/api/v3/PriceFieldValueTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/PriceSetTest.php b/tests/phpunit/api/v3/PriceSetTest.php index a0bc982bae..804235483c 100644 --- a/tests/phpunit/api/v3/PriceSetTest.php +++ b/tests/phpunit/api/v3/PriceSetTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/ProfileTest.php b/tests/phpunit/api/v3/ProfileTest.php index f54465b7c0..a286365914 100644 --- a/tests/phpunit/api/v3/ProfileTest.php +++ b/tests/phpunit/api/v3/ProfileTest.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 | +--------------------------------------------------------------------+ -*/ + */ /** * Include class definitions diff --git a/tests/phpunit/api/v3/RelationshipTypeTest.php b/tests/phpunit/api/v3/RelationshipTypeTest.php index b05a66768f..55a8bed182 100644 --- a/tests/phpunit/api/v3/RelationshipTypeTest.php +++ b/tests/phpunit/api/v3/RelationshipTypeTest.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/tests/phpunit/api/v3/ReportTemplateTest.php b/tests/phpunit/api/v3/ReportTemplateTest.php index e7609c17fc..6108fa53ed 100644 --- a/tests/phpunit/api/v3/ReportTemplateTest.php +++ b/tests/phpunit/api/v3/ReportTemplateTest.php @@ -131,7 +131,7 @@ class api_v3_ReportTemplateTest extends CiviUnitTestCase { $this->assertEquals('Default Organization', $result[0]['civicrm_contact_sort_name']); $this->assertEquals('Second Domain', $result[1]['civicrm_contact_sort_name']); $this->assertEquals('15 Main St', $result[1]['civicrm_address_street_address']); - */ + */ } /** diff --git a/tests/phpunit/api/v3/SystemTest.php b/tests/phpunit/api/v3/SystemTest.php index f6b8a3feb2..416ddb74c7 100644 --- a/tests/phpunit/api/v3/SystemTest.php +++ b/tests/phpunit/api/v3/SystemTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; diff --git a/tests/phpunit/api/v3/TaxContributionPageTest.php b/tests/phpunit/api/v3/TaxContributionPageTest.php index 06446b67e8..d53c0dc141 100644 --- a/tests/phpunit/api/v3/TaxContributionPageTest.php +++ b/tests/phpunit/api/v3/TaxContributionPageTest.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 | +--------------------------------------------------------------------+ -*/ + */ require_once 'CiviTest/CiviUnitTestCase.php'; -- 2.25.1