diff --git a/CRM/Contact/Selector.php b/CRM/Contact/Selector.php
index 87f8a6f70f828aa9592e4664ee6ff12b8018c5fa..5197f39abd8e7a1febaa38d17125e39f19283516 100644
--- a/CRM/Contact/Selector.php
+++ b/CRM/Contact/Selector.php
@@ -328,6 +328,19 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
*/
function &getColumnHeaders($action = NULL, $output = NULL) {
$headers = NULL;
+
+ // unset return property elements that we don't care
+ if (!empty($this->_returnProperties)) {
+ $doNotCareElements = array(
+ 'contact_type',
+ 'contact_sub_type',
+ 'sort_name',
+ );
+ foreach ( $doNotCareElements as $value) {
+ unset($this->_returnProperties[$value]);
+ }
+ }
+
if ($output == CRM_Core_Selector_Controller::EXPORT) {
$csvHeaders = array(ts('Contact Id'), ts('Contact Type'));
foreach ($this->getColHeads($action, $output) as $column) {
@@ -430,10 +443,6 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
$properties = self::makeProperties($this->_returnProperties);
foreach ($properties as $prop) {
- if ($prop == 'contact_type' || $prop == 'contact_sub_type' || $prop == 'sort_name') {
- continue;
- }
-
if (strpos($prop, '-')) {
list($loc, $fld, $phoneType) = CRM_Utils_System::explode('-', $prop, 3);
$title = $this->_query->_fields[$fld]['title'];
@@ -444,7 +453,8 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
}
elseif (isset($this->_query->_fields[$prop]) && isset($this->_query->_fields[$prop]['title'])) {
$title = $this->_query->_fields[$prop]['title'];
- } else {
+ }
+ else {
$title = '';
}
diff --git a/CRM/Utils/Array.php b/CRM/Utils/Array.php
index c6e8cfb93a86ff2c9ef9d9ace3ba3378f1007b47..575c0e66b880594f254cbab8145633d0c5ebe319 100644
--- a/CRM/Utils/Array.php
+++ b/CRM/Utils/Array.php
@@ -635,5 +635,48 @@ class CRM_Utils_Array {
}
return $default;
}
+
+ /**
+ * Generate the Cartesian product of zero or more vectors
+ *
+ * @param array $dimensions list of dimensions to multiply; each key is a dimension name; each value is a vector
+ * @param array $template a base set of values included in every output
+ * @return array each item is a distinct combination of values from $dimensions
+ *
+ * For example, the product of
+ * {
+ * fg => {red, blue},
+ * bg => {white, black}
+ * }
+ * would be
+ * {
+ * {fg => red, bg => white},
+ * {fg => red, bg => black},
+ * {fg => blue, bg => white},
+ * {fg => blue, bg => black}
+ * }
+ */
+ static function product($dimensions, $template = array()) {
+ if (empty($dimensions)) {
+ return array($template);
+ }
+
+ foreach ($dimensions as $key => $value) {
+ $firstKey = $key;
+ $firstValues = $value;
+ break;
+ }
+ unset($dimensions[$key]);
+
+ $results = array();
+ foreach ($firstValues as $firstValue) {
+ foreach (self::product($dimensions, $template) as $result) {
+ $result[$firstKey] = $firstValue;
+ $results[] = $result;
+ }
+ }
+
+ return $results;
+ }
}
diff --git a/api/v3/Profile.php b/api/v3/Profile.php
index d57751b1924dc5c67163cea2d982e38a916aa04f..300873f298968bd918362576f5310037e32f82d3 100644
--- a/api/v3/Profile.php
+++ b/api/v3/Profile.php
@@ -581,8 +581,10 @@ function _civicrm_api3_buildprofile_submitfields($profileID, $optionsBehaviour =
if(isset($profileFields[$profileID][$entityfield])) {
unset($profileFields[$profileID][$entityfield]);
}
- // we will make the mixed case version (e.g. of 'Primary') an alias
- $profileFields[$profileID][$fieldName]['api.aliases'][] = $entityfield;
+ if(!in_array($entityfield, $profileFields[$profileID][$fieldName]['api.aliases'])) {
+ // we will make the mixed case version (e.g. of 'Primary') an alias
+ $profileFields[$profileID][$fieldName]['api.aliases'][] = $entityfield;
+ }
}
/**
* putting this on hold -this would cause the api to set the default - but could have unexpected behaviour
diff --git a/api/v3/examples/Activity/ContactRefCustomField.php b/api/v3/examples/Activity/ContactRefCustomField.php
index b227a6a5308dd6128acc193f6b7d52af44042613..2b027d5f0b756a0ae965676118ef31401bb1a410 100644
--- a/api/v3/examples/Activity/ContactRefCustomField.php
+++ b/api/v3/examples/Activity/ContactRefCustomField.php
@@ -95,4 +95,4 @@ function activity_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Activity/ContactRefCustomFieldGet.php b/api/v3/examples/Activity/ContactRefCustomFieldGet.php
index 25b80b455851e12ea6ee2380f5fbffb6193be86a..cbc1cabd11cc5baf3515a5c5d5faf9721cf5c225 100644
--- a/api/v3/examples/Activity/ContactRefCustomFieldGet.php
+++ b/api/v3/examples/Activity/ContactRefCustomFieldGet.php
@@ -49,6 +49,8 @@ function activity_get_expectedresult(){
'is_current_revision' => '1',
'is_deleted' => 0,
'source_contact_id' => '1',
+ 'custom_1' => 'defaultValue',
+ 'custom_1_1' => 'defaultValue',
'custom_2_id' => '1',
'custom_2_1_id' => '1',
'custom_2' => 'Anderson, Anthony',
@@ -81,4 +83,4 @@ function activity_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Activity/DateTimeHigh.php b/api/v3/examples/Activity/DateTimeHigh.php
index 1242157cef9f5b0480a117efea6481757557a1a1..7d5642e9fdd988d2b93f74b86457f5074e892563 100644
--- a/api/v3/examples/Activity/DateTimeHigh.php
+++ b/api/v3/examples/Activity/DateTimeHigh.php
@@ -78,4 +78,4 @@ function activity_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Activity/DateTimeLow.php b/api/v3/examples/Activity/DateTimeLow.php
index d191789f87c22dfa55e5bfab3fed60d9c2cf18ef..57fc1efd35338a92374c37c8c56b262d32cbacd5 100644
--- a/api/v3/examples/Activity/DateTimeLow.php
+++ b/api/v3/examples/Activity/DateTimeLow.php
@@ -77,4 +77,4 @@ function activity_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Activity/GetTargetandAssignee.php b/api/v3/examples/Activity/GetTargetandAssignee.php
index e6b7027e23a45a43d8db0d9934ad9e5b0bac625f..9798b3e8725662be0da1944bd7849d64f1750a18 100644
--- a/api/v3/examples/Activity/GetTargetandAssignee.php
+++ b/api/v3/examples/Activity/GetTargetandAssignee.php
@@ -96,4 +96,4 @@ function activity__expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Activity/ReturnAssigneeContact.php b/api/v3/examples/Activity/ReturnAssigneeContact.php
index a9be1fcddc5a7b3ddd43b8fc8914d5f7a89d4815..e1a1cef84e45679a5dcb55745b800963f4dd07e4 100644
--- a/api/v3/examples/Activity/ReturnAssigneeContact.php
+++ b/api/v3/examples/Activity/ReturnAssigneeContact.php
@@ -79,11 +79,16 @@ function activity_get_expectedresult(){
'nick_name' => '',
'legal_name' => '',
'image_URL' => '',
+ 'preferred_communication_method' => '',
+ 'preferred_language' => 'en_US',
'preferred_mail_format' => 'Both',
'first_name' => 'Anthony',
'middle_name' => 'J.',
'last_name' => 'Anderson',
+ 'prefix_id' => 'Mr.',
+ 'suffix_id' => 'II',
'job_title' => '',
+ 'gender_id' => '',
'birth_date' => '',
'is_deceased' => 0,
'deceased_date' => '',
@@ -114,6 +119,9 @@ function activity_get_expectedresult(){
'im' => '',
'worldregion_id' => '',
'world_region' => '',
+ 'individual_prefix' => 'Mr.',
+ 'individual_suffix' => 'II',
+ 'gender' => '',
'state_province_name' => '',
'state_province' => '',
'country' => '',
@@ -149,4 +157,4 @@ function activity_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ActivityCreate.php b/api/v3/examples/ActivityCreate.php
index bd5f4c1d8580238127b119d3346dde6f891c486c..722110f0966fac00af36ccaec4857a62b46d52d9 100644
--- a/api/v3/examples/ActivityCreate.php
+++ b/api/v3/examples/ActivityCreate.php
@@ -95,4 +95,4 @@ function activity_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ActivityDelete.php b/api/v3/examples/ActivityDelete.php
index 19b198d1dc07615fb69d558805724cc75be38a46..a12b92624c1936f2f9bc5fb1a8a5791a235e462b 100644
--- a/api/v3/examples/ActivityDelete.php
+++ b/api/v3/examples/ActivityDelete.php
@@ -58,4 +58,4 @@ function activity_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ActivityGet.php b/api/v3/examples/ActivityGet.php
index 5b1dd1ac1ca696eae6438941b0ddc3bc93c050ff..d26b11da93630f8d56df367d127a2f1e22c2ac61 100644
--- a/api/v3/examples/ActivityGet.php
+++ b/api/v3/examples/ActivityGet.php
@@ -77,4 +77,4 @@ function activity_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ActivityGetfields.php b/api/v3/examples/ActivityGetfields.php
index 7e493fb8cfe4b03b1e561fc7ef4828f6ae491605..14ec4f1799e40df6eb40da37f8764ddae84ed0ed 100644
--- a/api/v3/examples/ActivityGetfields.php
+++ b/api/v3/examples/ActivityGetfields.php
@@ -45,6 +45,7 @@ function activity_getfields_expectedresult(){
'import' => true,
'where' => 'civicrm_activity.activity_type_id',
'headerPattern' => '/(activity.)?type(.id$)/i',
+ 'default' => '1',
'pseudoconstant' => array(
'optionGroupName' => 'activity_type',
),
@@ -94,7 +95,7 @@ function activity_getfields_expectedresult(){
'name' => 'relationship_id',
'type' => 1,
'title' => 'Relationship Id',
- 'default' => 'UL',
+ 'default' => 'NULL',
'FKClassName' => 'CRM_Contact_DAO_Relationship',
),
'is_current_revision' => array(
@@ -105,6 +106,7 @@ function activity_getfields_expectedresult(){
'where' => 'civicrm_activity.is_current_revision',
'headerPattern' => '/(is.)?(current.)?(revision|version(ing)?)/i',
'export' => true,
+ 'default' => '1',
),
'original_id' => array(
'name' => 'original_id',
@@ -187,6 +189,9 @@ function activity_getfields_expectedresult(){
'optionGroupName' => 'activity_status',
),
'uniqueName' => 'activity_status_id',
+ 'api.aliases' => array(
+ '0' => 'activity_status',
+ ),
),
'is_test' => array(
'name' => 'is_test',
@@ -202,7 +207,7 @@ function activity_getfields_expectedresult(){
'name' => 'medium_id',
'type' => 1,
'title' => 'Activity Medium',
- 'default' => 'UL',
+ 'default' => 'NULL',
'pseudoconstant' => array(
'optionGroupName' => 'encounter_medium',
),
@@ -229,11 +234,16 @@ function activity_getfields_expectedresult(){
'campaign_id' => array(
'name' => 'campaign_id',
'type' => 1,
- 'title' => 'Campaign ID',
+ 'title' => 'Campaign',
'import' => true,
'where' => 'civicrm_activity.campaign_id',
'export' => true,
'FKClassName' => 'CRM_Campaign_DAO_Campaign',
+ 'pseudoconstant' => array(
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ ),
'uniqueName' => 'activity_campaign_id',
),
'engagement_level' => array(
@@ -294,4 +304,4 @@ function activity_getfields_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ActivityTypeCreate.php b/api/v3/examples/ActivityTypeCreate.php
index 1f06df0f0a774df767f69eab3460410c2084eab6..ab54fef0695a5a835375146082e63474be5d759a 100644
--- a/api/v3/examples/ActivityTypeCreate.php
+++ b/api/v3/examples/ActivityTypeCreate.php
@@ -36,10 +36,10 @@ function activity_type_create_expectedresult(){
'is_error' => 0,
'version' => 3,
'count' => 1,
- 'id' => 722,
+ 'id' => 727,
'values' => array(
- '722' => array(
- 'id' => '722',
+ '727' => array(
+ 'id' => '727',
'option_group_id' => '2',
'label' => 'send out letters',
'value' => '46',
@@ -83,4 +83,4 @@ function activity_type_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ActivityTypeGet.php b/api/v3/examples/ActivityTypeGet.php
index ea32e955cca3e0526bc48a1d1cd3eb47850a2faf..7db5bde5ece7dda5903fa3812205cd0f7e4b51f7 100644
--- a/api/v3/examples/ActivityTypeGet.php
+++ b/api/v3/examples/ActivityTypeGet.php
@@ -102,4 +102,4 @@ function activity_type_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Address/AddressLike.php b/api/v3/examples/Address/AddressLike.php
index 33c263ee08b59ddd5cc2e08de3bcdb4fa86e59ff..23ebfdfe0b5db261aac3737e60071dd931af745b 100644
--- a/api/v3/examples/Address/AddressLike.php
+++ b/api/v3/examples/Address/AddressLike.php
@@ -77,4 +77,4 @@ function address_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Address/AddressParse.php b/api/v3/examples/Address/AddressParse.php
index 8fe23d354e09b96f84bb4d671ef8b83af2efca29..3264a9779e1d73a7a0b49d8a303d5a4c93febe6a 100644
--- a/api/v3/examples/Address/AddressParse.php
+++ b/api/v3/examples/Address/AddressParse.php
@@ -76,4 +76,4 @@ function address_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Address/AddressSort.php b/api/v3/examples/Address/AddressSort.php
index 15a83157b46576f093d509eab8fd9a39883b5f1e..cd80828af674153ccc13cbb2d3b6b159af84b7fc 100644
--- a/api/v3/examples/Address/AddressSort.php
+++ b/api/v3/examples/Address/AddressSort.php
@@ -96,4 +96,4 @@ function address_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/AddressCreate.php b/api/v3/examples/AddressCreate.php
index 51fd3683d4ce3560e94ae11275bf3d464abbbb5e..c60211fbc6732b660a5e7c768ff844d0bd25368d 100644
--- a/api/v3/examples/AddressCreate.php
+++ b/api/v3/examples/AddressCreate.php
@@ -82,4 +82,4 @@ function address_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/AddressDelete.php b/api/v3/examples/AddressDelete.php
index 49e701041590442d5a72a44461e76ceb8400d71a..6a36efb6d8311c067b037038b1a25caf185384dd 100644
--- a/api/v3/examples/AddressDelete.php
+++ b/api/v3/examples/AddressDelete.php
@@ -58,4 +58,4 @@ function address_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/AddressGet.php b/api/v3/examples/AddressGet.php
index 9db78400609e243beb26bc4cf71e03cd40eb5df6..48af478645e3f76861ffce35f636899bac966f34 100644
--- a/api/v3/examples/AddressGet.php
+++ b/api/v3/examples/AddressGet.php
@@ -75,4 +75,4 @@ function address_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/BatchCreate.php b/api/v3/examples/BatchCreate.php
index 80976d11f81fd205301eb1ac4188a4e479dbc4cc..af01a81a450f5475bae00a753fd42a8ef284f9be 100644
--- a/api/v3/examples/BatchCreate.php
+++ b/api/v3/examples/BatchCreate.php
@@ -46,7 +46,7 @@ function batch_create_expectedresult(){
'created_id' => '',
'created_date' => '',
'modified_id' => '',
- 'modified_date' => '',
+ 'modified_date' => '2012-11-14 16:02:35',
'saved_search_id' => '',
'status_id' => '1',
'type_id' => '',
@@ -55,6 +55,7 @@ function batch_create_expectedresult(){
'item_count' => '3',
'payment_instrument_id' => '',
'exported_date' => '',
+ 'data' => '',
),
),
);
@@ -83,4 +84,4 @@ function batch_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/BatchDelete.php b/api/v3/examples/BatchDelete.php
index 6149e3fcaccbc3a6709ca7c41c5ef5765fcc87b5..105f9759804562d7b1e5b39833bcbdeb23fbc7b9 100644
--- a/api/v3/examples/BatchDelete.php
+++ b/api/v3/examples/BatchDelete.php
@@ -58,4 +58,4 @@ function batch_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/BatchGet.php b/api/v3/examples/BatchGet.php
index 449cf74db499825441dbb0ec21d8a723732eed06..35b0b9bba68c23436e088040485300f0e8a8a6d5 100644
--- a/api/v3/examples/BatchGet.php
+++ b/api/v3/examples/BatchGet.php
@@ -37,6 +37,7 @@ function batch_get_expectedresult(){
'id' => '1',
'name' => 'Batch_433397',
'title' => 'Batch_433397',
+ 'modified_date' => '2012-11-14 16:02:35',
'status_id' => '1',
),
),
@@ -66,4 +67,4 @@ function batch_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/BatchUpdate.php b/api/v3/examples/BatchUpdate.php
index 453aa22521a69bd5e190d31ba5cc4e7bb08fcb1f..110a199ce02acafe40c7adb2fa813571fba2c495 100644
--- a/api/v3/examples/BatchUpdate.php
+++ b/api/v3/examples/BatchUpdate.php
@@ -55,6 +55,7 @@ function batch_update_expectedresult(){
'item_count' => '4',
'payment_instrument_id' => '',
'exported_date' => '',
+ 'data' => '',
),
),
);
@@ -83,4 +84,4 @@ function batch_update_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CampaignCreate.php b/api/v3/examples/CampaignCreate.php
index e3afaaddb395d7da6be4d00ca11be8bbff3d1563..b4ddb16da0febd663c6ec429bbf117038fd38cbd 100644
--- a/api/v3/examples/CampaignCreate.php
+++ b/api/v3/examples/CampaignCreate.php
@@ -81,4 +81,4 @@ function campaign_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CampaignDelete.php b/api/v3/examples/CampaignDelete.php
index 8ae1877d77a48c3ed72b11edeb4db09827719341..a646cf72b149670380c4010a2538ac6b77ce7458 100644
--- a/api/v3/examples/CampaignDelete.php
+++ b/api/v3/examples/CampaignDelete.php
@@ -58,4 +58,4 @@ function campaign_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CampaignGet.php b/api/v3/examples/CampaignGet.php
index ce69a6196eab0078fe4c5667af8c3c802cca8203..8ff149f39c796293b86f06a5ad249b619923ea9f 100644
--- a/api/v3/examples/CampaignGet.php
+++ b/api/v3/examples/CampaignGet.php
@@ -70,4 +70,4 @@ function campaign_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ConstantGet.php b/api/v3/examples/ConstantGet.php
index 42f6a59b593a4663b65cf8e32402e5aa2cccea7b..c3032cfacd4c45ece6caaba0bb5699c32a485af0 100644
--- a/api/v3/examples/ConstantGet.php
+++ b/api/v3/examples/ConstantGet.php
@@ -64,4 +64,4 @@ function constant_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/APIChainedArray.php b/api/v3/examples/Contact/APIChainedArray.php
index f3ba6e6b953cdf1d75f0c909c6c90dbbbb6ad200..6cbb0ccddb5a76467ad7b96e97465fa97fb03374 100644
--- a/api/v3/examples/Contact/APIChainedArray.php
+++ b/api/v3/examples/Contact/APIChainedArray.php
@@ -56,6 +56,8 @@ function contact_get_expectedresult(){
'nick_name' => '',
'legal_name' => '',
'image_URL' => '',
+ 'preferred_communication_method' => '',
+ 'preferred_language' => 'en_US',
'preferred_mail_format' => 'Both',
'first_name' => 'abc3',
'middle_name' => '',
@@ -211,4 +213,4 @@ function contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/APIChainedArrayFormats.php b/api/v3/examples/Contact/APIChainedArrayFormats.php
index e100b942762264ec19780ee4950b0d7be446f884..746edf5bea03071c1b2c5dd4e7e4252c7135fec3 100644
--- a/api/v3/examples/Contact/APIChainedArrayFormats.php
+++ b/api/v3/examples/Contact/APIChainedArrayFormats.php
@@ -58,6 +58,8 @@ function contact_get_expectedresult(){
'nick_name' => '',
'legal_name' => '',
'image_URL' => '',
+ 'preferred_communication_method' => '',
+ 'preferred_language' => 'en_US',
'preferred_mail_format' => 'Both',
'first_name' => 'abc3',
'middle_name' => '',
@@ -146,4 +148,4 @@ function contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/APIChainedArrayMultipleCustom.php b/api/v3/examples/Contact/APIChainedArrayMultipleCustom.php
index 4c1b8d26ec4009b52ef96b9db19ea73c08fd0b5f..12f0a14e2abee6bcc2f81285fe488b4a714f77ea 100644
--- a/api/v3/examples/Contact/APIChainedArrayMultipleCustom.php
+++ b/api/v3/examples/Contact/APIChainedArrayMultipleCustom.php
@@ -55,6 +55,8 @@ function contact_get_expectedresult(){
'nick_name' => '',
'legal_name' => '',
'image_URL' => '',
+ 'preferred_communication_method' => '',
+ 'preferred_language' => 'en_US',
'preferred_mail_format' => 'Both',
'first_name' => 'abc3',
'middle_name' => '',
@@ -126,17 +128,17 @@ function contact_get_expectedresult(){
),
'3' => array(
'entity_id' => '1',
- 'latest' => 'defaultValue',
+ 'latest' => '',
'id' => '3',
'1' => 'warm beer',
- '2' => 'defaultValue',
+ '2' => '',
),
'4' => array(
'entity_id' => '1',
- 'latest' => 'defaultValue',
+ 'latest' => '',
'id' => '4',
- '1' => 'defaultValue',
- '2' => 'defaultValue',
+ '1' => '',
+ '2' => '',
),
'5' => array(
'entity_id' => '1',
@@ -152,9 +154,9 @@ function contact_get_expectedresult(){
),
'7' => array(
'entity_id' => '1',
- 'latest' => 'defaultValue',
+ 'latest' => '',
'id' => '7',
- '1' => 'defaultValue',
+ '1' => '',
),
),
),
@@ -186,4 +188,4 @@ function contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/APIChainedArrayValuesFromSiblingFunction.php b/api/v3/examples/Contact/APIChainedArrayValuesFromSiblingFunction.php
index 2b374551587f3377c98acdbf8dfdcf04561d277b..82a07fa5ffa6fa21eb902562f2cd16251a204620 100644
--- a/api/v3/examples/Contact/APIChainedArrayValuesFromSiblingFunction.php
+++ b/api/v3/examples/Contact/APIChainedArrayValuesFromSiblingFunction.php
@@ -126,4 +126,4 @@ function contact_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/ChainTwoWebsites.php b/api/v3/examples/Contact/ChainTwoWebsites.php
index 6b1880fb37da65d1d82e16ce43be96eec0a79786..635069251dabc5cd2e27f473ae72d0df6efa33c9 100644
--- a/api/v3/examples/Contact/ChainTwoWebsites.php
+++ b/api/v3/examples/Contact/ChainTwoWebsites.php
@@ -198,4 +198,4 @@ function contact_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/ChainTwoWebsitesSyntax2.php b/api/v3/examples/Contact/ChainTwoWebsitesSyntax2.php
index c5474b2d7513fe75ebf00dcd79e13cc91f690465..e5233017edb38fff6e4f0dca13bd3c272b4c881a 100644
--- a/api/v3/examples/Contact/ChainTwoWebsitesSyntax2.php
+++ b/api/v3/examples/Contact/ChainTwoWebsitesSyntax2.php
@@ -203,4 +203,4 @@ function contact_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/CustomFieldGet.php b/api/v3/examples/Contact/CustomFieldGet.php
index 7076ac73739e9fed188a70387be700d783ba203f..c9ae23ae445f5a47d7c31998c0428056e66e8023 100644
--- a/api/v3/examples/Contact/CustomFieldGet.php
+++ b/api/v3/examples/Contact/CustomFieldGet.php
@@ -67,4 +67,4 @@ function contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/CustomFieldGetReturnSyntaxVariation.php b/api/v3/examples/Contact/CustomFieldGetReturnSyntaxVariation.php
index 2d69422671caa75029a3db44da163b72276c85c1..59c8ee741546eefdc8edd76f64367e2e468d99a3 100644
--- a/api/v3/examples/Contact/CustomFieldGetReturnSyntaxVariation.php
+++ b/api/v3/examples/Contact/CustomFieldGetReturnSyntaxVariation.php
@@ -67,4 +67,4 @@ function contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/FormatIsSuccess_Fail.php b/api/v3/examples/Contact/FormatIsSuccess_Fail.php
index 8ba618db7e593c8b77d163b4f01b44ec445b1c22..60dad237bea97bf53ba5eb3d4ee472b8b0932aa5 100644
--- a/api/v3/examples/Contact/FormatIsSuccess_Fail.php
+++ b/api/v3/examples/Contact/FormatIsSuccess_Fail.php
@@ -55,4 +55,4 @@ function contact_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/FormatIsSuccess_True.php b/api/v3/examples/Contact/FormatIsSuccess_True.php
index 77b6f35eea7e5a7bc2204b382afae3a0b8b26f78..d8c13321fb76763030f1097c0c2708e3b9e706fd 100644
--- a/api/v3/examples/Contact/FormatIsSuccess_True.php
+++ b/api/v3/examples/Contact/FormatIsSuccess_True.php
@@ -55,4 +55,4 @@ function contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/FormatOnlyID.php b/api/v3/examples/Contact/FormatOnlyID.php
index 3acbd4dc3ac347135e9a775d3a825a18fb1e1999..b63433735b41c0ec4cebe210de06adac7c4be8ba 100644
--- a/api/v3/examples/Contact/FormatOnlyID.php
+++ b/api/v3/examples/Contact/FormatOnlyID.php
@@ -56,4 +56,4 @@ function contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/FormatSingleValue.php b/api/v3/examples/Contact/FormatSingleValue.php
index 2e9b14250cbd59b79e2dd9bf6477690891761ab5..65cd12fc95d21b350853102ff93e08a3537869ac 100644
--- a/api/v3/examples/Contact/FormatSingleValue.php
+++ b/api/v3/examples/Contact/FormatSingleValue.php
@@ -56,4 +56,4 @@ function contact_getvalue_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/GetCountContact.php b/api/v3/examples/Contact/GetCountContact.php
index d9b8e566e21b8931a766450a4c5288279bf01931..d7af5c027b6723ab1f72353bd21fa1049023baa1 100644
--- a/api/v3/examples/Contact/GetCountContact.php
+++ b/api/v3/examples/Contact/GetCountContact.php
@@ -54,4 +54,4 @@ function contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/GetFieldsOptions.php b/api/v3/examples/Contact/GetFieldsOptions.php
index 4337b348705ad811d8a7574d3a8484f919f3f3ff..e41ec7d2818ea30a730feaf5312f851c6495418c 100644
--- a/api/v3/examples/Contact/GetFieldsOptions.php
+++ b/api/v3/examples/Contact/GetFieldsOptions.php
@@ -88,7 +88,7 @@ function contact_getfields_expectedresult(){
'import' => true,
'where' => 'civicrm_contact.do_not_email',
'headerPattern' => '/d(o )?(not )?(email)/i',
- 'dataPattern' => '/^\d{1,}$/',
+ 'dataPattern' => '/^\\d{1,}$/',
'export' => true,
),
'do_not_phone' => array(
@@ -98,7 +98,7 @@ function contact_getfields_expectedresult(){
'import' => true,
'where' => 'civicrm_contact.do_not_phone',
'headerPattern' => '/d(o )?(not )?(call|phone)/i',
- 'dataPattern' => '/^\d{1,}$/',
+ 'dataPattern' => '/^\\d{1,}$/',
'export' => true,
),
'do_not_mail' => array(
@@ -107,8 +107,8 @@ function contact_getfields_expectedresult(){
'title' => 'Do Not Mail',
'import' => true,
'where' => 'civicrm_contact.do_not_mail',
- 'headerPattern' => '/^(d(o\s)?n(ot\s)?mail)|(\w*)?bulk\s?(\w*)$/i',
- 'dataPattern' => '/^\d{1,}$/',
+ 'headerPattern' => '/^(d(o\\s)?n(ot\\s)?mail)|(\\w*)?bulk\\s?(\\w*)$/i',
+ 'dataPattern' => '/^\\d{1,}$/',
'export' => true,
),
'do_not_sms' => array(
@@ -118,7 +118,7 @@ function contact_getfields_expectedresult(){
'import' => true,
'where' => 'civicrm_contact.do_not_sms',
'headerPattern' => '/d(o )?(not )?(sms)/i',
- 'dataPattern' => '/^\d{1,}$/',
+ 'dataPattern' => '/^\\d{1,}$/',
'export' => true,
),
'do_not_trade' => array(
@@ -128,7 +128,7 @@ function contact_getfields_expectedresult(){
'import' => true,
'where' => 'civicrm_contact.do_not_trade',
'headerPattern' => '/d(o )?(not )?(trade)/i',
- 'dataPattern' => '/^\d{1,}$/',
+ 'dataPattern' => '/^\\d{1,}$/',
'export' => true,
),
'is_opt_out' => array(
@@ -148,8 +148,8 @@ function contact_getfields_expectedresult(){
'size' => 20,
'import' => true,
'where' => 'civicrm_contact.legal_identifier',
- 'headerPattern' => '/legal\s?id/i',
- 'dataPattern' => '/\w+?\d{5,}/',
+ 'headerPattern' => '/legal\\s?id/i',
+ 'dataPattern' => '/\\w+?\\d{5,}/',
'export' => true,
),
'external_identifier' => array(
@@ -160,8 +160,8 @@ function contact_getfields_expectedresult(){
'size' => 8,
'import' => true,
'where' => 'civicrm_contact.external_identifier',
- 'headerPattern' => '/external\s?id/i',
- 'dataPattern' => '/^\d{11,}$/',
+ 'headerPattern' => '/external\\s?id/i',
+ 'dataPattern' => '/^\\d{11,}$/',
'export' => true,
),
'sort_name' => array(
@@ -190,8 +190,8 @@ function contact_getfields_expectedresult(){
'size' => 30,
'import' => true,
'where' => 'civicrm_contact.nick_name',
- 'headerPattern' => '/n(ick\s)name|nick$/i',
- 'dataPattern' => '/^\w+$/',
+ 'headerPattern' => '/n(ick\\s)name|nick$/i',
+ 'dataPattern' => '/^\\w+$/',
'export' => true,
),
'legal_name' => array(
@@ -202,7 +202,7 @@ function contact_getfields_expectedresult(){
'size' => 30,
'import' => true,
'where' => 'civicrm_contact.legal_name',
- 'headerPattern' => '/^legal|(l(egal\s)?name)$/i',
+ 'headerPattern' => '/^legal|(l(egal\\s)?name)$/i',
'export' => true,
),
'image_URL' => array(
@@ -223,8 +223,8 @@ function contact_getfields_expectedresult(){
'size' => 45,
'import' => true,
'where' => 'civicrm_contact.preferred_communication_method',
- 'headerPattern' => '/^p(ref\w*\s)?c(omm\w*)|( meth\w*)$/i',
- 'dataPattern' => '/^\w+$/',
+ 'headerPattern' => '/^p(ref\\w*\\s)?c(omm\\w*)|( meth\\w*)$/i',
+ 'dataPattern' => '/^\\w+$/',
'export' => true,
'pseudoconstant' => array(
'optionGroupName' => 'preferred_communication_method',
@@ -251,7 +251,7 @@ function contact_getfields_expectedresult(){
'title' => 'Preferred Mail Format',
'import' => true,
'where' => 'civicrm_contact.preferred_mail_format',
- 'headerPattern' => '/^p(ref\w*\s)?m(ail\s)?f(orm\w*)$/i',
+ 'headerPattern' => '/^p(ref\\w*\\s)?m(ail\\s)?f(orm\\w*)$/i',
'export' => true,
'default' => 'Both',
'enumValues' => 'Text, HTML, Both',
@@ -280,8 +280,8 @@ function contact_getfields_expectedresult(){
'size' => 30,
'import' => true,
'where' => 'civicrm_contact.first_name',
- 'headerPattern' => '/^first|(f(irst\s)?name)$/i',
- 'dataPattern' => '/^\w+$/',
+ 'headerPattern' => '/^first|(f(irst\\s)?name)$/i',
+ 'dataPattern' => '/^\\w+$/',
'export' => true,
),
'middle_name' => array(
@@ -292,8 +292,8 @@ function contact_getfields_expectedresult(){
'size' => 20,
'import' => true,
'where' => 'civicrm_contact.middle_name',
- 'headerPattern' => '/^middle|(m(iddle\s)?name)$/i',
- 'dataPattern' => '/^\w+$/',
+ 'headerPattern' => '/^middle|(m(iddle\\s)?name)$/i',
+ 'dataPattern' => '/^\\w+$/',
'export' => true,
),
'last_name' => array(
@@ -304,8 +304,8 @@ function contact_getfields_expectedresult(){
'size' => 30,
'import' => true,
'where' => 'civicrm_contact.last_name',
- 'headerPattern' => '/^last|(l(ast\s)?name)$/i',
- 'dataPattern' => '/^\w+(\s\w+)?+$/',
+ 'headerPattern' => '/^last|(l(ast\\s)?name)$/i',
+ 'dataPattern' => '/^\\w+(\\s\\w+)?+$/',
'export' => true,
),
'prefix_id' => array(
@@ -315,7 +315,7 @@ function contact_getfields_expectedresult(){
'import' => true,
'where' => 'civicrm_contact.prefix_id',
'headerPattern' => '/^(prefix|title)/i',
- 'dataPattern' => '/^(mr|ms|mrs|sir|dr)\.?$/i',
+ 'dataPattern' => '/^(mr|ms|mrs|sir|dr)\\.?$/i',
'export' => true,
'pseudoconstant' => array(
'optionGroupName' => 'individual_prefix',
@@ -332,7 +332,7 @@ function contact_getfields_expectedresult(){
'import' => true,
'where' => 'civicrm_contact.suffix_id',
'headerPattern' => '/^suffix$/i',
- 'dataPattern' => '/^(sr|jr)\.?|i{2,}$/',
+ 'dataPattern' => '/^(sr|jr)\\.?|i{2,}$/',
'export' => true,
'pseudoconstant' => array(
'optionGroupName' => 'individual_suffix',
@@ -413,7 +413,7 @@ function contact_getfields_expectedresult(){
'size' => 20,
'import' => true,
'where' => 'civicrm_contact.job_title',
- 'headerPattern' => '/^job|(j(ob\s)?title)$/i',
+ 'headerPattern' => '/^job|(j(ob\\s)?title)$/i',
'dataPattern' => '//',
'export' => true,
),
@@ -435,8 +435,8 @@ function contact_getfields_expectedresult(){
'title' => 'Birth Date',
'import' => true,
'where' => 'civicrm_contact.birth_date',
- 'headerPattern' => '/^birth|(b(irth\s)?date)|D(\W*)O(\W*)B(\W*)$/i',
- 'dataPattern' => '/\d{4}-?\d{2}-?\d{2}/',
+ 'headerPattern' => '/^birth|(b(irth\\s)?date)|D(\\W*)O(\\W*)B(\\W*)$/i',
+ 'dataPattern' => '/\\d{4}-?\\d{2}-?\\d{2}/',
'export' => true,
),
'is_deceased' => array(
@@ -445,7 +445,7 @@ function contact_getfields_expectedresult(){
'title' => 'Is Deceased',
'import' => true,
'where' => 'civicrm_contact.is_deceased',
- 'headerPattern' => '/i(s\s)?d(eceased)$/i',
+ 'headerPattern' => '/i(s\\s)?d(eceased)$/i',
'export' => true,
),
'deceased_date' => array(
@@ -454,7 +454,7 @@ function contact_getfields_expectedresult(){
'title' => 'Deceased Date',
'import' => true,
'where' => 'civicrm_contact.deceased_date',
- 'headerPattern' => '/^deceased|(d(eceased\s)?date)$/i',
+ 'headerPattern' => '/^deceased|(d(eceased\\s)?date)$/i',
'export' => true,
),
'household_name' => array(
@@ -465,8 +465,8 @@ function contact_getfields_expectedresult(){
'size' => 30,
'import' => true,
'where' => 'civicrm_contact.household_name',
- 'headerPattern' => '/^household|(h(ousehold\s)?name)$/i',
- 'dataPattern' => '/^\w+$/',
+ 'headerPattern' => '/^household|(h(ousehold\\s)?name)$/i',
+ 'dataPattern' => '/^\\w+$/',
'export' => true,
),
'primary_contact_id' => array(
@@ -483,8 +483,8 @@ function contact_getfields_expectedresult(){
'size' => 30,
'import' => true,
'where' => 'civicrm_contact.organization_name',
- 'headerPattern' => '/^organization|(o(rganization\s)?name)$/i',
- 'dataPattern' => '/^\w+$/',
+ 'headerPattern' => '/^organization|(o(rganization\\s)?name)$/i',
+ 'dataPattern' => '/^\\w+$/',
'export' => true,
),
'sic_code' => array(
@@ -495,7 +495,7 @@ function contact_getfields_expectedresult(){
'size' => 8,
'import' => true,
'where' => 'civicrm_contact.sic_code',
- 'headerPattern' => '/^sic|(s(ic\s)?code)$/i',
+ 'headerPattern' => '/^sic|(s(ic\\s)?code)$/i',
'export' => true,
),
'user_unique_id' => array(
@@ -506,8 +506,8 @@ function contact_getfields_expectedresult(){
'size' => 45,
'import' => true,
'where' => 'civicrm_contact.user_unique_id',
- 'headerPattern' => '/^Open\s?ID|u(niq\w*)?\s?ID/i',
- 'dataPattern' => '/^[\w\/\:\.]+$/',
+ 'headerPattern' => '/^Open\\s?ID|u(niq\\w*)?\\s?ID/i',
+ 'dataPattern' => '/^[\\w\\/\\:\\.]+$/',
'export' => true,
'rule' => 'url',
),
@@ -516,14 +516,14 @@ function contact_getfields_expectedresult(){
'type' => 256,
'title' => 'Created Date',
'required' => '',
- 'default' => 'UL',
+ 'default' => 'NULL',
),
'modified_date' => array(
'name' => 'modified_date',
'type' => 256,
'title' => 'Modified Date',
'required' => '',
- 'default' => 'URRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAM',
+ 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
),
'source' => array(
'name' => 'source',
@@ -533,7 +533,7 @@ function contact_getfields_expectedresult(){
'size' => 30,
'import' => true,
'where' => 'civicrm_contact.source',
- 'headerPattern' => '/(S(ource\s)?o(f\s)?C(ontact\s)?Data)$/i',
+ 'headerPattern' => '/(S(ource\\s)?o(f\\s)?C(ontact\\s)?Data)$/i',
'export' => true,
'uniqueName' => 'contact_source',
),
@@ -616,4 +616,4 @@ function contact_getfields_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/GetSingleContact.php b/api/v3/examples/Contact/GetSingleContact.php
index 5e9cfa746541f9aa623f23bb9e3ef4e968bb03a3..3c5766582e54d2b8ade8b32148eaad2db6daf285 100644
--- a/api/v3/examples/Contact/GetSingleContact.php
+++ b/api/v3/examples/Contact/GetSingleContact.php
@@ -46,6 +46,8 @@ function contact_getsingle_expectedresult(){
'nick_name' => '',
'legal_name' => '',
'image_URL' => '',
+ 'preferred_communication_method' => '',
+ 'preferred_language' => '',
'preferred_mail_format' => '',
'first_name' => 'Test',
'middle_name' => '',
@@ -117,4 +119,4 @@ function contact_getsingle_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contact/GroupFilterUsingContactAPI.php b/api/v3/examples/Contact/GroupFilterUsingContactAPI.php
index 0cc978a61f77b37b495e923c4266644d4af5d5aa..01b837bfb0c6b1805a289ac948ef508ff7f3b26a 100644
--- a/api/v3/examples/Contact/GroupFilterUsingContactAPI.php
+++ b/api/v3/examples/Contact/GroupFilterUsingContactAPI.php
@@ -54,6 +54,8 @@ function contact_get_expectedresult(){
'nick_name' => '',
'legal_name' => '',
'image_URL' => '',
+ 'preferred_communication_method' => '',
+ 'preferred_language' => 'en_US',
'preferred_mail_format' => 'Both',
'first_name' => '',
'middle_name' => '',
@@ -127,4 +129,4 @@ function contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContactCreate.php b/api/v3/examples/ContactCreate.php
index 0b7b39c699b3334881e8a967c90fdca432b29ffd..abe8f2c244cf481436bc63d894fbc3d2f6cf1c09 100644
--- a/api/v3/examples/ContactCreate.php
+++ b/api/v3/examples/ContactCreate.php
@@ -112,4 +112,4 @@ function contact_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContactDelete.php b/api/v3/examples/ContactDelete.php
index f299e0244b8c203b5c86dde1f1c1cc95a9e05302..6a4923da518a4dd1477755d92ebabfba550eb97f 100644
--- a/api/v3/examples/ContactDelete.php
+++ b/api/v3/examples/ContactDelete.php
@@ -58,4 +58,4 @@ function contact_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContactGet.php b/api/v3/examples/ContactGet.php
index 481b5cc329b42e9d8f35dcc6f52327be0ca1800d..7101dbfe2e84b4412b6abd731dd2a64057535804 100644
--- a/api/v3/examples/ContactGet.php
+++ b/api/v3/examples/ContactGet.php
@@ -50,6 +50,8 @@ function contact_get_expectedresult(){
'nick_name' => '',
'legal_name' => '',
'image_URL' => '',
+ 'preferred_communication_method' => '',
+ 'preferred_language' => 'en_US',
'preferred_mail_format' => 'Both',
'first_name' => '',
'middle_name' => '',
@@ -123,4 +125,4 @@ function contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContactGetoptions.php b/api/v3/examples/ContactGetoptions.php
index 2497092f17a0c60149f93bcb22d23309e8405abf..bb2b39207277639b08ba0b4c666413ea00f74fc4 100644
--- a/api/v3/examples/ContactGetoptions.php
+++ b/api/v3/examples/ContactGetoptions.php
@@ -61,4 +61,4 @@ function contact_getoptions_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contribution/ContributionCreateWithNote.php b/api/v3/examples/Contribution/ContributionCreateWithNote.php
index dd139fea7716f3124dc781c1db178d8d8ceadbb0..2979fac39ff58cf53e52949f9e428e7cf3db7f72 100644
--- a/api/v3/examples/Contribution/ContributionCreateWithNote.php
+++ b/api/v3/examples/Contribution/ContributionCreateWithNote.php
@@ -103,4 +103,4 @@ function contribution_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contribution/ContributionCreateWithSoftCredit.php b/api/v3/examples/Contribution/ContributionCreateWithSoftCredit.php
index 5517820800d4cc3a09a41f1d480f8a9f38da3c12..a96330fae5eeac1b03bfefc3764c350dbb3f8228 100644
--- a/api/v3/examples/Contribution/ContributionCreateWithSoftCredit.php
+++ b/api/v3/examples/Contribution/ContributionCreateWithSoftCredit.php
@@ -47,7 +47,7 @@ function contribution_create_expectedresult(){
'contact_id' => '1',
'financial_type_id' => '1',
'contribution_page_id' => '',
- 'payment_instrument_id' => '',
+ 'payment_instrument_id' => '4',
'receive_date' => '20120511000000',
'non_deductible_amount' => '10',
'total_amount' => '100',
@@ -100,4 +100,4 @@ function contribution_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Contribution/CreateWithNestedLineItems.php b/api/v3/examples/Contribution/CreateWithNestedLineItems.php
index 4ad4565a66c092f0ab5047ca6c4eecc7b7ab7560..48237f9b2bb6a727281a9a650fbd7bdf4b5a4b55 100644
--- a/api/v3/examples/Contribution/CreateWithNestedLineItems.php
+++ b/api/v3/examples/Contribution/CreateWithNestedLineItems.php
@@ -163,4 +163,4 @@ function contribution_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionCreate.php b/api/v3/examples/ContributionCreate.php
index a96d60686d2f577d3a8da3114e7bf4905136682a..8cbbf75319d830b35317206cb3b2a92d874bf7b6 100644
--- a/api/v3/examples/ContributionCreate.php
+++ b/api/v3/examples/ContributionCreate.php
@@ -99,4 +99,4 @@ function contribution_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionDelete.php b/api/v3/examples/ContributionDelete.php
index f2586828a53c208826eb7eed6eb40dddf51ed0ca..c144e2e4bdd3c915fe6351504e0f3bac39d4ce90 100644
--- a/api/v3/examples/ContributionDelete.php
+++ b/api/v3/examples/ContributionDelete.php
@@ -61,4 +61,4 @@ function contribution_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionGet.php b/api/v3/examples/ContributionGet.php
index 41f8714c285fddf3951600c298cd4d6c07985473..7d6f41f9a614046733e8c2fbc9cbf10de1c54e8b 100644
--- a/api/v3/examples/ContributionGet.php
+++ b/api/v3/examples/ContributionGet.php
@@ -61,8 +61,8 @@ function contribution_get_expectedresult(){
'contribution_campaign_id' => '',
'financial_type_id' => '1',
'financial_type' => 'Donation',
- 'instrument_id' => '',
- 'payment_instrument' => '',
+ 'instrument_id' => '84',
+ 'payment_instrument' => 'Check',
'product_id' => '',
'product_name' => '',
'sku' => '',
@@ -77,7 +77,7 @@ function contribution_get_expectedresult(){
'contribution_note' => '',
'contribution_batch' => '',
'contribution_status' => 'Completed',
- 'contribution_payment_instrument' => '',
+ 'contribution_payment_instrument' => 'Check',
'contribution_check_number' => '',
'id' => '1',
'contribution_type_id' => '1',
@@ -109,4 +109,4 @@ function contribution_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionPageCreate.php b/api/v3/examples/ContributionPageCreate.php
index 11be46d350651511f91b50a255281a3085bafaa2..9b2d5191eb837654680f19d685bf66884480c7bb 100644
--- a/api/v3/examples/ContributionPageCreate.php
+++ b/api/v3/examples/ContributionPageCreate.php
@@ -113,4 +113,4 @@ function contribution_page_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionPageDelete.php b/api/v3/examples/ContributionPageDelete.php
index dc3a05d59c73a29fe4258b289eee63ce2b550b96..2e214f900cefa6bce4c10fcbef95c7f0e18ec745 100644
--- a/api/v3/examples/ContributionPageDelete.php
+++ b/api/v3/examples/ContributionPageDelete.php
@@ -58,4 +58,4 @@ function contribution_page_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionPageGet.php b/api/v3/examples/ContributionPageGet.php
index bdb335613a228ec2973ee25e312cad631241ef5d..ae3d93b2ece3f9240c6f08a8c1842b71924591ca 100644
--- a/api/v3/examples/ContributionPageGet.php
+++ b/api/v3/examples/ContributionPageGet.php
@@ -82,4 +82,4 @@ function contribution_page_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionRecurCreate.php b/api/v3/examples/ContributionRecurCreate.php
index 9caa2ac86551fd383de1de235e4371bb0c3d3794..43ffe3c8664b2dcc1b807edbb468335ae5ac2fc3 100644
--- a/api/v3/examples/ContributionRecurCreate.php
+++ b/api/v3/examples/ContributionRecurCreate.php
@@ -96,4 +96,4 @@ function contribution_recur_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionRecurDelete.php b/api/v3/examples/ContributionRecurDelete.php
index 2f4a8e0ce496d22f640684964f8ea6188eab8c70..395e42e487357be3c37d873e9a7ad3d948bd53e6 100644
--- a/api/v3/examples/ContributionRecurDelete.php
+++ b/api/v3/examples/ContributionRecurDelete.php
@@ -58,4 +58,4 @@ function contribution_recur_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionRecurGet.php b/api/v3/examples/ContributionRecurGet.php
index 4218e7458b88afbc87693f6f3f6bcb0fe5eb129d..c2454c6cf206912785a08c9e2e467fa5011bdee1 100644
--- a/api/v3/examples/ContributionRecurGet.php
+++ b/api/v3/examples/ContributionRecurGet.php
@@ -77,4 +77,4 @@ function contribution_recur_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionSoftCreate.php b/api/v3/examples/ContributionSoftCreate.php
index c9e12465f1467f807c1942ac3b92f906b4a38c8f..f9120ee8d90be876075255ed5b9e1e5fefbcabf9 100644
--- a/api/v3/examples/ContributionSoftCreate.php
+++ b/api/v3/examples/ContributionSoftCreate.php
@@ -74,4 +74,4 @@ function contribution_soft_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionSoftDelete.php b/api/v3/examples/ContributionSoftDelete.php
index 5ca7d1b92db51b5dfdd04e04d32a34add79b6b77..9a5fb94446179719dd5ce456d5d67fe5c0acba6d 100644
--- a/api/v3/examples/ContributionSoftDelete.php
+++ b/api/v3/examples/ContributionSoftDelete.php
@@ -53,4 +53,4 @@ function contribution_soft_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ContributionSoftGet.php b/api/v3/examples/ContributionSoftGet.php
index 93625387da41ecf1c69d1e02a732dbfbf065e782..5bff00d7708c3e1a2fa1ca173e01c1d0952f1d9e 100644
--- a/api/v3/examples/ContributionSoftGet.php
+++ b/api/v3/examples/ContributionSoftGet.php
@@ -68,4 +68,4 @@ function contribution_soft_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CustomFieldCreate.php b/api/v3/examples/CustomFieldCreate.php
index 24644eb443bbdaea7ea133a14d55e88d3948e747..001e47b2a4e933d6d9b4502efd275c9a127ccd66 100644
--- a/api/v3/examples/CustomFieldCreate.php
+++ b/api/v3/examples/CustomFieldCreate.php
@@ -100,4 +100,4 @@ function custom_field_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CustomFieldDelete.php b/api/v3/examples/CustomFieldDelete.php
index db4437fccb7e9d662c30700861202e6a1a84f481..5900f0f9336969fd388574c244a517351008f27a 100644
--- a/api/v3/examples/CustomFieldDelete.php
+++ b/api/v3/examples/CustomFieldDelete.php
@@ -58,4 +58,4 @@ function custom_field_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CustomGroupCreate.php b/api/v3/examples/CustomGroupCreate.php
index 235eb182e46cdc1dc91844f52347da70c95abc02..3dc77441d7115af3345fd25aa679beb56927ad1e 100644
--- a/api/v3/examples/CustomGroupCreate.php
+++ b/api/v3/examples/CustomGroupCreate.php
@@ -92,4 +92,4 @@ function custom_group_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CustomGroupDelete.php b/api/v3/examples/CustomGroupDelete.php
index e5b7dc15e634b051c2035a408893e96bb9dbaf97..70096253bbeefa0d4a06b1220677e96ac7923089 100644
--- a/api/v3/examples/CustomGroupDelete.php
+++ b/api/v3/examples/CustomGroupDelete.php
@@ -58,4 +58,4 @@ function custom_group_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CustomGroupGet.php b/api/v3/examples/CustomGroupGet.php
index 35d4217897988fd1e56f689eda3e232d61b4a208..d94d3d2ba68c8f5ca0887d939d0dd75cd5a89812 100644
--- a/api/v3/examples/CustomGroupGet.php
+++ b/api/v3/examples/CustomGroupGet.php
@@ -74,4 +74,4 @@ function custom_group_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CustomValue/formatFieldName.php b/api/v3/examples/CustomValue/formatFieldName.php
index a7f3e0abc50a8a36a7de1936d0edb3c812d8fe4a..d922746cbd343ec711b7b6cfc54ba12bf37d6ccc 100644
--- a/api/v3/examples/CustomValue/formatFieldName.php
+++ b/api/v3/examples/CustomValue/formatFieldName.php
@@ -108,4 +108,4 @@ function custom_value_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CustomValueCreate.php b/api/v3/examples/CustomValueCreate.php
index fb8e0479f44b3be8e5a290a5f3debad57c861818..a9e0bd2c3181643ef28b406b7930321b55344c0f 100644
--- a/api/v3/examples/CustomValueCreate.php
+++ b/api/v3/examples/CustomValueCreate.php
@@ -59,4 +59,4 @@ function custom_value_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/CustomValueGet.php b/api/v3/examples/CustomValueGet.php
index e5d81ea44715977d935038a990587d8adcb87c03..8c32d184e16bd055e9df90dc32c62cf05e084243 100644
--- a/api/v3/examples/CustomValueGet.php
+++ b/api/v3/examples/CustomValueGet.php
@@ -107,4 +107,4 @@ function custom_value_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/DomainCreate.php b/api/v3/examples/DomainCreate.php
index 5de8ff77ccc220780ba62b661d431041d57094ee..aa1bdeea0e5661f6c9e8832a1f54131e83fe83cc 100644
--- a/api/v3/examples/DomainCreate.php
+++ b/api/v3/examples/DomainCreate.php
@@ -73,4 +73,4 @@ function domain_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/DomainGet.php b/api/v3/examples/DomainGet.php
index 2456fea48c10f00a02e09feb3ba196492ac51a5a..11a7dd89bf7300d2eabd7972ccf40bca5197c1c2 100644
--- a/api/v3/examples/DomainGet.php
+++ b/api/v3/examples/DomainGet.php
@@ -35,9 +35,10 @@ function domain_get_expectedresult(){
'0' => array(
'id' => '1',
'name' => 'Default Domain Name',
- 'config_backend' => 'a:80:{s:10:"userSystem";O:26:"CRM_Utils_System_UnitTests":4:{s:9:"is_drupal";b:0;s:9:"is_joomla";b:0;s:12:"is_wordpress";b:0;s:24:"supports_form_extensions";b:0;}s:11:"initialized";i:0;s:15:"DAOFactoryClass";s:23:"CRM_Contact_DAO_Factory";s:17:"componentRegistry";O:18:"CRM_Core_Component":0:{}s:9:"inCiviCRM";b:0;s:18:"recaptchaPublicKey";N;s:5:"debug";i:0;s:9:"backtrace";i:0;s:12:"resourceBase";N;s:13:"extensionsURL";N;s:12:"countryLimit";a:1:{i:0;s:4:"1228";}s:27:"defaultContactStateProvince";N;s:13:"provinceLimit";a:1:{i:0;s:4:"1228";}s:21:"defaultContactCountry";s:4:"1228";s:15:"defaultCurrency";s:3:"USD";s:10:"lcMessages";s:5:"en_US";s:18:"dateformatDatetime";s:20:"%B %E%f, %Y %l:%M %P";s:14:"dateformatFull";s:11:"%B %E%f, %Y";s:17:"dateformatPartial";s:5:"%B %Y";s:14:"dateformatYear";s:2:"%Y";s:14:"dateformatTime";s:8:"%l:%M %P";s:15:"timeInputFormat";i:1;s:15:"dateInputFormat";s:8:"mm/dd/yy";s:15:"fiscalYearStart";a:2:{s:1:"M";i:1;s:1:"d";i:1;}s:11:"moneyformat";s:5:"%c %a";s:16:"moneyvalueformat";s:3:"%!i";s:15:"currencySymbols";s:0:"";s:21:"defaultCurrencySymbol";s:1:"$";s:20:"monetaryDecimalPoint";s:1:".";s:25:"monetaryThousandSeparator";s:1:",";s:14:"gettextCodeset";s:5:"utf-8";s:13:"gettextDomain";s:7:"civicrm";s:27:"userFrameworkUsersTableName";s:5:"users";s:21:"userFrameworkFrontend";b:0;s:20:"userFrameworkLogging";b:0;s:17:"maxImportFileSize";i:1048576;s:11:"maxFileSize";i:2;s:11:"mapProvider";N;s:9:"mapAPIKey";N;s:11:"geoProvider";N;s:9:"geoAPIKey";N;s:13:"geocodeMethod";s:0:"";s:12:"mapGeoCoding";i:1;s:7:"logging";b:0;s:12:"versionCheck";b:1;s:16:"enableComponents";a:6:{i:0;s:14:"CiviContribute";i:1;s:10:"CiviPledge";i:2;s:10:"CiviMember";i:3;s:9:"CiviEvent";i:4;s:8:"CiviMail";i:5;s:10:"CiviReport";}s:18:"enableComponentIDs";a:6:{i:0;i:1;i:1;i:6;i:2;i:2;i:3;i:3;i:4;i:4;i:5;i:8;}s:9:"enableSSL";b:0;s:18:"fatalErrorTemplate";s:20:"CRM/common/fatal.tpl";s:17:"fatalErrorHandler";N;s:14:"legacyEncoding";s:12:"Windows-1252";s:14:"fieldSeparator";s:1:",";s:17:"maxLocationBlocks";i:2;s:15:"captchaFontPath";s:25:"/usr/X11R6/lib/X11/fonts/";s:11:"captchaFont";s:17:"HelveticaBold.ttf";s:21:"includeWildCardInName";i:1;s:18:"includeEmailInName";i:1;s:21:"includeNickNameInName";i:0;s:22:"smartGroupCacheTimeout";i:5;s:22:"defaultSearchProfileID";N;s:21:"dashboardCacheTimeout";i:1440;s:15:"doNotResetCache";i:0;s:24:"includeAlphabeticalPager";i:1;s:20:"includeOrderByClause";i:1;s:13:"oldInputStyle";i:1;s:14:"formKeyDisable";b:0;s:21:"doNotAttachPDFReceipt";b:0;s:15:"wkhtmltopdfPath";b:0;s:23:"secondDegRelPermissions";b:0;s:10:"wpBasePage";N;s:13:"verpSeparator";s:1:".";s:12:"mailerPeriod";i:180;s:16:"mailerSpoolLimit";i:0;s:16:"mailerBatchLimit";i:0;s:13:"mailerJobSize";i:0;s:13:"mailerJobsMax";i:0;s:16:"mailThrottleTime";i:0;s:12:"customCSSURL";N;s:15:"civiRelativeURL";s:13:"/index.php?q=";s:11:"civiVersion";s:10:"4.4.alpha1";}',
+ 'config_backend' => 'a:82:{s:10:\"userSystem\";O:26:\"CRM_Utils_System_UnitTests\":4:{s:9:\"is_drupal\";b:0;s:9:\"is_joomla\";b:0;s:12:\"is_wordpress\";b:0;s:24:\"supports_form_extensions\";b:0;}s:11:\"initialized\";i:0;s:15:\"DAOFactoryClass\";s:23:\"CRM_Contact_DAO_Factory\";s:17:\"componentRegistry\";O:18:\"CRM_Core_Component\":0:{}s:9:\"inCiviCRM\";b:0;s:18:\"recaptchaPublicKey\";N;s:5:\"debug\";i:0;s:9:\"backtrace\";i:0;s:12:\"resourceBase\";N;s:13:\"extensionsURL\";N;s:12:\"countryLimit\";a:1:{i:0;s:4:\"1228\";}s:27:\"defaultContactStateProvince\";N;s:13:\"provinceLimit\";a:1:{i:0;s:4:\"1228\";}s:21:\"defaultContactCountry\";s:4:\"1228\";s:15:\"defaultCurrency\";s:3:\"USD\";s:10:\"lcMessages\";s:5:\"en_US\";s:18:\"dateformatDatetime\";s:20:\"%B %E%f, %Y %l:%M %P\";s:14:\"dateformatFull\";s:11:\"%B %E%f, %Y\";s:17:\"dateformatPartial\";s:5:\"%B %Y\";s:14:\"dateformatYear\";s:2:\"%Y\";s:14:\"dateformatTime\";s:8:\"%l:%M %P\";s:15:\"timeInputFormat\";i:1;s:15:\"dateInputFormat\";s:8:\"mm/dd/yy\";s:15:\"fiscalYearStart\";a:2:{s:1:\"M\";i:1;s:1:\"d\";i:1;}s:11:\"moneyformat\";s:5:\"%c %a\";s:16:\"moneyvalueformat\";s:3:\"%!i\";s:15:\"currencySymbols\";s:0:\"\";s:21:\"defaultCurrencySymbol\";s:1:\"$\";s:20:\"monetaryDecimalPoint\";s:1:\".\";s:25:\"monetaryThousandSeparator\";s:1:\",\";s:14:\"gettextCodeset\";s:5:\"utf-8\";s:13:\"gettextDomain\";s:7:\"civicrm\";s:27:\"userFrameworkUsersTableName\";s:5:\"users\";s:21:\"userFrameworkFrontend\";b:0;s:20:\"userFrameworkLogging\";b:0;s:17:\"maxImportFileSize\";i:2097152;s:11:\"maxFileSize\";i:2;s:11:\"mapProvider\";N;s:9:\"mapAPIKey\";N;s:11:\"geoProvider\";N;s:9:\"geoAPIKey\";N;s:13:\"geocodeMethod\";s:0:\"\";s:12:\"mapGeoCoding\";i:1;s:7:\"logging\";b:0;s:12:\"versionCheck\";b:1;s:16:\"enableComponents\";a:6:{i:0;s:14:\"CiviContribute\";i:1;s:10:\"CiviPledge\";i:2;s:10:\"CiviMember\";i:3;s:9:\"CiviEvent\";i:4;s:8:\"CiviMail\";i:5;s:10:\"CiviReport\";}s:18:\"enableComponentIDs\";a:6:{i:0;i:1;i:1;i:6;i:2;i:2;i:3;i:3;i:4;i:4;i:5;i:8;}s:9:\"enableSSL\";b:0;s:18:\"fatalErrorTemplate\";s:20:\"CRM/common/fatal.tpl\";s:17:\"fatalErrorHandler\";N;s:14:\"legacyEncoding\";s:12:\"Windows-1252\";s:14:\"fieldSeparator\";s:1:\",\";s:17:\"maxLocationBlocks\";i:2;s:15:\"captchaFontPath\";s:25:\"/usr/X11R6/lib/X11/fonts/\";s:11:\"captchaFont\";s:17:\"HelveticaBold.ttf\";s:21:\"includeWildCardInName\";i:1;s:18:\"includeEmailInName\";i:1;s:21:\"includeNickNameInName\";i:0;s:22:\"smartGroupCacheTimeout\";i:5;s:22:\"defaultSearchProfileID\";N;s:21:\"dashboardCacheTimeout\";i:1440;s:15:\"doNotResetCache\";i:0;s:24:\"includeAlphabeticalPager\";i:1;s:20:\"includeOrderByClause\";i:1;s:13:\"oldInputStyle\";i:1;s:14:\"formKeyDisable\";b:0;s:21:\"doNotAttachPDFReceipt\";b:0;s:15:\"wkhtmltopdfPath\";b:0;s:23:\"secondDegRelPermissions\";b:0;s:10:\"wpBasePage\";N;s:9:\"groupTree\";b:0;s:11:\"revampPages\";a:0:{}s:13:\"verpSeparator\";s:1:\".\";s:12:\"mailerPeriod\";i:180;s:16:\"mailerSpoolLimit\";i:0;s:16:\"mailerBatchLimit\";i:0;s:13:\"mailerJobSize\";i:0;s:13:\"mailerJobsMax\";i:0;s:16:\"mailThrottleTime\";i:0;s:12:\"customCSSURL\";N;s:15:\"civiRelativeURL\";s:13:\"/index.php?q=\";s:11:\"civiVersion\";s:5:\"4.4.4\";}',
'version' => '3',
'contact_id' => '3',
+ 'locale_custom_strings' => 'a:1:{s:5:\"en_US\";a:0:{}}',
'domain_email' => 'my@email.com',
'domain_phone' => array(
'phone_type' => 'Phone',
@@ -60,10 +61,10 @@ function domain_get_expectedresult(){
'1' => array(
'id' => '2',
'name' => 'Second Domain',
- 'config_backend' => 'a:80:{s:10:"userSystem";O:26:"CRM_Utils_System_UnitTests":4:{s:9:"is_drupal";b:0;s:9:"is_joomla";b:0;s:12:"is_wordpress";b:0;s:24:"supports_form_extensions";b:0;}s:11:"initialized";i:0;s:15:"DAOFactoryClass";s:23:"CRM_Contact_DAO_Factory";s:17:"componentRegistry";O:18:"CRM_Core_Component":0:{}s:9:"inCiviCRM";b:0;s:18:"recaptchaPublicKey";N;s:5:"debug";i:0;s:9:"backtrace";i:0;s:12:"resourceBase";N;s:13:"extensionsURL";N;s:12:"countryLimit";a:1:{i:0;s:4:"1228";}s:27:"defaultContactStateProvince";N;s:13:"provinceLimit";a:1:{i:0;s:4:"1228";}s:21:"defaultContactCountry";s:4:"1228";s:15:"defaultCurrency";s:3:"USD";s:10:"lcMessages";s:5:"en_US";s:18:"dateformatDatetime";s:20:"%B %E%f, %Y %l:%M %P";s:14:"dateformatFull";s:11:"%B %E%f, %Y";s:17:"dateformatPartial";s:5:"%B %Y";s:14:"dateformatYear";s:2:"%Y";s:14:"dateformatTime";s:8:"%l:%M %P";s:15:"timeInputFormat";i:1;s:15:"dateInputFormat";s:8:"mm/dd/yy";s:15:"fiscalYearStart";a:2:{s:1:"M";i:1;s:1:"d";i:1;}s:11:"moneyformat";s:5:"%c %a";s:16:"moneyvalueformat";s:3:"%!i";s:15:"currencySymbols";s:0:"";s:21:"defaultCurrencySymbol";s:1:"$";s:20:"monetaryDecimalPoint";s:1:".";s:25:"monetaryThousandSeparator";s:1:",";s:14:"gettextCodeset";s:5:"utf-8";s:13:"gettextDomain";s:7:"civicrm";s:27:"userFrameworkUsersTableName";s:5:"users";s:21:"userFrameworkFrontend";b:0;s:20:"userFrameworkLogging";b:0;s:17:"maxImportFileSize";i:1048576;s:11:"maxFileSize";i:2;s:11:"mapProvider";N;s:9:"mapAPIKey";N;s:11:"geoProvider";N;s:9:"geoAPIKey";N;s:13:"geocodeMethod";s:0:"";s:12:"mapGeoCoding";i:1;s:7:"logging";b:0;s:12:"versionCheck";b:1;s:16:"enableComponents";a:6:{i:0;s:14:"CiviContribute";i:1;s:10:"CiviPledge";i:2;s:10:"CiviMember";i:3;s:9:"CiviEvent";i:4;s:8:"CiviMail";i:5;s:10:"CiviReport";}s:18:"enableComponentIDs";a:6:{i:0;i:1;i:1;i:6;i:2;i:2;i:3;i:3;i:4;i:4;i:5;i:8;}s:9:"enableSSL";b:0;s:18:"fatalErrorTemplate";s:20:"CRM/common/fatal.tpl";s:17:"fatalErrorHandler";N;s:14:"legacyEncoding";s:12:"Windows-1252";s:14:"fieldSeparator";s:1:",";s:17:"maxLocationBlocks";i:2;s:15:"captchaFontPath";s:25:"/usr/X11R6/lib/X11/fonts/";s:11:"captchaFont";s:17:"HelveticaBold.ttf";s:21:"includeWildCardInName";i:1;s:18:"includeEmailInName";i:1;s:21:"includeNickNameInName";i:0;s:22:"smartGroupCacheTimeout";i:5;s:22:"defaultSearchProfileID";N;s:21:"dashboardCacheTimeout";i:1440;s:15:"doNotResetCache";i:0;s:24:"includeAlphabeticalPager";i:1;s:20:"includeOrderByClause";i:1;s:13:"oldInputStyle";i:1;s:14:"formKeyDisable";b:0;s:21:"doNotAttachPDFReceipt";b:0;s:15:"wkhtmltopdfPath";b:0;s:23:"secondDegRelPermissions";b:0;s:10:"wpBasePage";N;s:13:"verpSeparator";s:1:".";s:12:"mailerPeriod";i:180;s:16:"mailerSpoolLimit";i:0;s:16:"mailerBatchLimit";i:0;s:13:"mailerJobSize";i:0;s:13:"mailerJobsMax";i:0;s:16:"mailThrottleTime";i:0;s:12:"customCSSURL";N;s:15:"civiRelativeURL";s:13:"/index.php?q=";s:11:"civiVersion";s:10:"4.4.alpha1";}',
+ 'config_backend' => 'a:82:{s:10:\"userSystem\";O:26:\"CRM_Utils_System_UnitTests\":4:{s:9:\"is_drupal\";b:0;s:9:\"is_joomla\";b:0;s:12:\"is_wordpress\";b:0;s:24:\"supports_form_extensions\";b:0;}s:11:\"initialized\";i:0;s:15:\"DAOFactoryClass\";s:23:\"CRM_Contact_DAO_Factory\";s:17:\"componentRegistry\";O:18:\"CRM_Core_Component\":0:{}s:9:\"inCiviCRM\";b:0;s:18:\"recaptchaPublicKey\";N;s:5:\"debug\";i:0;s:9:\"backtrace\";i:0;s:12:\"resourceBase\";N;s:13:\"extensionsURL\";N;s:12:\"countryLimit\";a:1:{i:0;s:4:\"1228\";}s:27:\"defaultContactStateProvince\";N;s:13:\"provinceLimit\";a:1:{i:0;s:4:\"1228\";}s:21:\"defaultContactCountry\";s:4:\"1228\";s:15:\"defaultCurrency\";s:3:\"USD\";s:10:\"lcMessages\";s:5:\"en_US\";s:18:\"dateformatDatetime\";s:20:\"%B %E%f, %Y %l:%M %P\";s:14:\"dateformatFull\";s:11:\"%B %E%f, %Y\";s:17:\"dateformatPartial\";s:5:\"%B %Y\";s:14:\"dateformatYear\";s:2:\"%Y\";s:14:\"dateformatTime\";s:8:\"%l:%M %P\";s:15:\"timeInputFormat\";i:1;s:15:\"dateInputFormat\";s:8:\"mm/dd/yy\";s:15:\"fiscalYearStart\";a:2:{s:1:\"M\";i:1;s:1:\"d\";i:1;}s:11:\"moneyformat\";s:5:\"%c %a\";s:16:\"moneyvalueformat\";s:3:\"%!i\";s:15:\"currencySymbols\";s:0:\"\";s:21:\"defaultCurrencySymbol\";s:1:\"$\";s:20:\"monetaryDecimalPoint\";s:1:\".\";s:25:\"monetaryThousandSeparator\";s:1:\",\";s:14:\"gettextCodeset\";s:5:\"utf-8\";s:13:\"gettextDomain\";s:7:\"civicrm\";s:27:\"userFrameworkUsersTableName\";s:5:\"users\";s:21:\"userFrameworkFrontend\";b:0;s:20:\"userFrameworkLogging\";b:0;s:17:\"maxImportFileSize\";i:2097152;s:11:\"maxFileSize\";i:2;s:11:\"mapProvider\";N;s:9:\"mapAPIKey\";N;s:11:\"geoProvider\";N;s:9:\"geoAPIKey\";N;s:13:\"geocodeMethod\";s:0:\"\";s:12:\"mapGeoCoding\";i:1;s:7:\"logging\";b:0;s:12:\"versionCheck\";b:1;s:16:\"enableComponents\";a:6:{i:0;s:14:\"CiviContribute\";i:1;s:10:\"CiviPledge\";i:2;s:10:\"CiviMember\";i:3;s:9:\"CiviEvent\";i:4;s:8:\"CiviMail\";i:5;s:10:\"CiviReport\";}s:18:\"enableComponentIDs\";a:6:{i:0;i:1;i:1;i:6;i:2;i:2;i:3;i:3;i:4;i:4;i:5;i:8;}s:9:\"enableSSL\";b:0;s:18:\"fatalErrorTemplate\";s:20:\"CRM/common/fatal.tpl\";s:17:\"fatalErrorHandler\";N;s:14:\"legacyEncoding\";s:12:\"Windows-1252\";s:14:\"fieldSeparator\";s:1:\",\";s:17:\"maxLocationBlocks\";i:2;s:15:\"captchaFontPath\";s:25:\"/usr/X11R6/lib/X11/fonts/\";s:11:\"captchaFont\";s:17:\"HelveticaBold.ttf\";s:21:\"includeWildCardInName\";i:1;s:18:\"includeEmailInName\";i:1;s:21:\"includeNickNameInName\";i:0;s:22:\"smartGroupCacheTimeout\";i:5;s:22:\"defaultSearchProfileID\";N;s:21:\"dashboardCacheTimeout\";i:1440;s:15:\"doNotResetCache\";i:0;s:24:\"includeAlphabeticalPager\";i:1;s:20:\"includeOrderByClause\";i:1;s:13:\"oldInputStyle\";i:1;s:14:\"formKeyDisable\";b:0;s:21:\"doNotAttachPDFReceipt\";b:0;s:15:\"wkhtmltopdfPath\";b:0;s:23:\"secondDegRelPermissions\";b:0;s:10:\"wpBasePage\";N;s:9:\"groupTree\";b:0;s:11:\"revampPages\";a:0:{}s:13:\"verpSeparator\";s:1:\".\";s:12:\"mailerPeriod\";i:180;s:16:\"mailerSpoolLimit\";i:0;s:16:\"mailerBatchLimit\";i:0;s:13:\"mailerJobSize\";i:0;s:13:\"mailerJobsMax\";i:0;s:16:\"mailThrottleTime\";i:0;s:12:\"customCSSURL\";N;s:15:\"civiRelativeURL\";s:13:\"/index.php?q=\";s:11:\"civiVersion\";s:5:\"4.4.4\";}',
'version' => '4.3.alpha1',
'contact_id' => '2',
- 'domain_email' => '"Domain Email" <domainemail2@example.org>',
+ 'domain_email' => '\"Domain Email\" <domainemail2@example.org>',
'domain_phone' => array(
'phone_type' => 'Phone',
'phone' => '204 555-1001',
@@ -109,4 +110,4 @@ function domain_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Email/NestedReplaceEmail.php b/api/v3/examples/Email/NestedReplaceEmail.php
index 8f6a1b116c869decd2209c70a4ee26c6c767f81b..1ddd76698837c1580cf3fd38390434f866257fcd 100644
--- a/api/v3/examples/Email/NestedReplaceEmail.php
+++ b/api/v3/examples/Email/NestedReplaceEmail.php
@@ -79,11 +79,16 @@ function email_replace_expectedresult(){
'nick_name' => '',
'legal_name' => '',
'image_URL' => '',
+ 'preferred_communication_method' => '',
+ 'preferred_language' => 'en_US',
'preferred_mail_format' => 'Both',
'first_name' => '',
'middle_name' => '',
'last_name' => '',
+ 'prefix_id' => '',
+ 'suffix_id' => '',
'job_title' => '',
+ 'gender_id' => '',
'birth_date' => '',
'is_deceased' => 0,
'deceased_date' => '',
@@ -114,6 +119,9 @@ function email_replace_expectedresult(){
'im' => '',
'worldregion_id' => '',
'world_region' => '',
+ 'individual_prefix' => '',
+ 'individual_suffix' => '',
+ 'gender' => '',
'state_province_name' => '',
'state_province' => '',
'country' => '',
@@ -223,4 +231,4 @@ function email_replace_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/EmailCreate.php b/api/v3/examples/EmailCreate.php
index cfeb2745dacb3c83c273a4667c647ad40ae9f6d4..31e4e5e08fda686c5ef161354168b476cc20c4fb 100644
--- a/api/v3/examples/EmailCreate.php
+++ b/api/v3/examples/EmailCreate.php
@@ -77,4 +77,4 @@ function email_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/EmailDelete.php b/api/v3/examples/EmailDelete.php
index cd07fdbd4e14c16308f087264a948ad464fd0b98..f6baf60399866d8830ca35252c6a0bc27fc3c473 100644
--- a/api/v3/examples/EmailDelete.php
+++ b/api/v3/examples/EmailDelete.php
@@ -58,4 +58,4 @@ function email_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/EmailReplace.php b/api/v3/examples/EmailReplace.php
index fac556978282cead56db253789256453afac4256..b41733b31661aa0ace7f02914f2bc734ce2bf89f 100644
--- a/api/v3/examples/EmailReplace.php
+++ b/api/v3/examples/EmailReplace.php
@@ -156,4 +156,4 @@ function email_replace_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/EntityTagCreate.php b/api/v3/examples/EntityTagCreate.php
index 13c837eab85e76755fab346aa60667c272dc72ca..0ac14b3b47943554227099ce0d1fd4edbe31d1a1 100644
--- a/api/v3/examples/EntityTagCreate.php
+++ b/api/v3/examples/EntityTagCreate.php
@@ -59,4 +59,4 @@ function entity_tag_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/EntityTagDelete.php b/api/v3/examples/EntityTagDelete.php
index a52bd3521bb5bd44b3d58430e34aeaea114ff630..fb12f231bdd36f2bde31ddca3e26d3166867c576 100644
--- a/api/v3/examples/EntityTagDelete.php
+++ b/api/v3/examples/EntityTagDelete.php
@@ -59,4 +59,4 @@ function entity_tag_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/EntityTagGet.php b/api/v3/examples/EntityTagGet.php
index 9fa94d810356bab9355eb03ed7bd9c5ca5758af4..cf8b0333623bf7bd66b285c038512c4c98645fa4 100644
--- a/api/v3/examples/EntityTagGet.php
+++ b/api/v3/examples/EntityTagGet.php
@@ -59,4 +59,4 @@ function entity_tag_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Event/IsCurrentOption.php b/api/v3/examples/Event/IsCurrentOption.php
index af5302ddad9a0f1364ebcc1149c920adb045f4cf..87580daf020b82b1f2e0c6133ed09264cd73c10a 100644
--- a/api/v3/examples/Event/IsCurrentOption.php
+++ b/api/v3/examples/Event/IsCurrentOption.php
@@ -93,4 +93,4 @@ function event_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Event/IsFullOption.php b/api/v3/examples/Event/IsFullOption.php
index 7c49f621bb13d71eb70b8ec38454424d5a99be79..ee4ab7be563e1c954c3f721132fd2bfaf00f563b 100644
--- a/api/v3/examples/Event/IsFullOption.php
+++ b/api/v3/examples/Event/IsFullOption.php
@@ -50,7 +50,7 @@ function event_getsingle_expectedresult(){
'is_multiple_registrations' => 0,
'allow_same_participant_emails' => 0,
'is_template' => 0,
- 'created_date' => '2013-08-03 21:23:22',
+ 'created_date' => '2014-01-20 10:55:46',
'is_share' => '1',
'available_places' => 0,
'is_full' => '1',
@@ -80,4 +80,4 @@ function event_getsingle_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/EventCreate.php b/api/v3/examples/EventCreate.php
index 3b55e4d79bad212ad769c6a1a8c5cde4a5453e3e..49b68a5aff85306af5a7a9afaa08ab32a4dec01f 100644
--- a/api/v3/examples/EventCreate.php
+++ b/api/v3/examples/EventCreate.php
@@ -139,4 +139,4 @@ function event_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/EventDelete.php b/api/v3/examples/EventDelete.php
index e851cd6f32bba7b51ce5ead41b68dce3edb95709..f53763900331fa97503369848a8cd2f52b501a85 100644
--- a/api/v3/examples/EventDelete.php
+++ b/api/v3/examples/EventDelete.php
@@ -58,4 +58,4 @@ function event_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/EventGet.php b/api/v3/examples/EventGet.php
index 400d3dcaa51bbf716f331d1e6f0389f3d03a309a..2a5ba2051a1b4ced5fc04f6befaeb2ff2788e6fc 100644
--- a/api/v3/examples/EventGet.php
+++ b/api/v3/examples/EventGet.php
@@ -85,4 +85,4 @@ function event_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GrantCreate.php b/api/v3/examples/GrantCreate.php
index 97a42badf5ed51a826340d3a75ea4b0f999611bc..bc0e60045f9e4ba656dce53ff92f491a812bc28c 100644
--- a/api/v3/examples/GrantCreate.php
+++ b/api/v3/examples/GrantCreate.php
@@ -84,4 +84,4 @@ function grant_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GrantDelete.php b/api/v3/examples/GrantDelete.php
index d0a7214771b5d64e0a87a1f7769cd8756fff31b1..a0a8d91956e9c2666ae496a832453dd778aec2b3 100644
--- a/api/v3/examples/GrantDelete.php
+++ b/api/v3/examples/GrantDelete.php
@@ -58,4 +58,4 @@ function grant_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GrantGet.php b/api/v3/examples/GrantGet.php
index 0b340841e047cf827bf770fe29505f91b79cdacb..80c12b812ceb819b9571ee856a106a47385260b8 100644
--- a/api/v3/examples/GrantGet.php
+++ b/api/v3/examples/GrantGet.php
@@ -37,7 +37,7 @@ function grant_get_expectedresult(){
'id' => '2',
'contact_id' => '4',
'application_received_date' => '20130728084957',
- 'decision_date' => '2013-08-05',
+ 'decision_date' => '20130805000000',
'grant_type_id' => '1',
'amount_total' => '500.00',
'currency' => 'USD',
@@ -71,4 +71,4 @@ function grant_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Group/getfields.php b/api/v3/examples/Group/getfields.php
index 5a769c9056f045f9f4538020743f6cec82096c7c..176477e12bfc281c985600da72a3f873c298627e 100644
--- a/api/v3/examples/Group/getfields.php
+++ b/api/v3/examples/Group/getfields.php
@@ -174,4 +174,4 @@ function group_getfields_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GroupContact/GetWithGroupID.php b/api/v3/examples/GroupContact/GetWithGroupID.php
index 4832c484bc1441ece4ef14803c30db6a6b5d9b6a..26cbd4e65b2b5f7bd9c6bcd5a03eac55ba9daae5 100644
--- a/api/v3/examples/GroupContact/GetWithGroupID.php
+++ b/api/v3/examples/GroupContact/GetWithGroupID.php
@@ -47,16 +47,16 @@ function group_contact_get_expectedresult(){
'values' => array(
'0' => array(
'id' => '1',
- 'name' => 'Test Group 1_1',
+ 'name' => 'Test Group 1',
'title' => 'New Test Group Created',
'description' => 'New Test Group Created',
'source' => '',
'saved_search_id' => '',
'is_active' => '1',
'visibility' => 'Public Pages',
- 'where_clause' => ' ( `civicrm_group_contact-1`.group_id IN ( 1 ) AND `civicrm_group_contact-1`.status IN ("Added") ) ',
- 'select_tables' => 'a:8:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:25:"`civicrm_group_contact-1`";s:114:" LEFT JOIN civicrm_group_contact `civicrm_group_contact-1` ON contact_a.id = `civicrm_group_contact-1`.contact_id ";}',
- 'where_tables' => 'a:2:{s:15:"civicrm_contact";i:1;s:25:"`civicrm_group_contact-1`";s:114:" LEFT JOIN civicrm_group_contact `civicrm_group_contact-1` ON contact_a.id = `civicrm_group_contact-1`.contact_id ";}',
+ 'where_clause' => ' ( `civicrm_group_contact-1`.group_id IN ( 1 ) AND `civicrm_group_contact-1`.status IN (\"Added\") ) ',
+ 'select_tables' => 'a:8:{s:15:\"civicrm_contact\";i:1;s:15:\"civicrm_address\";i:1;s:15:\"civicrm_country\";i:1;s:13:\"civicrm_email\";i:1;s:13:\"civicrm_phone\";i:1;s:10:\"civicrm_im\";i:1;s:19:\"civicrm_worldregion\";i:1;s:25:\"`civicrm_group_contact-1`\";s:165:\" LEFT JOIN civicrm_group_contact `civicrm_group_contact-1` ON ( contact_a.id = `civicrm_group_contact-1`.contact_id AND `civicrm_group_contact-1`.group_id IN ( 1 ) )\";}',
+ 'where_tables' => 'a:2:{s:15:\"civicrm_contact\";i:1;s:25:\"`civicrm_group_contact-1`\";s:165:\" LEFT JOIN civicrm_group_contact `civicrm_group_contact-1` ON ( contact_a.id = `civicrm_group_contact-1`.contact_id AND `civicrm_group_contact-1`.group_id IN ( 1 ) )\";}',
'group_type' => array(
'0' => '1',
'1' => '2',
@@ -85,16 +85,16 @@ function group_contact_get_expectedresult(){
'values' => array(
'0' => array(
'id' => '1',
- 'name' => 'Test Group 1_1',
+ 'name' => 'Test Group 1',
'title' => 'New Test Group Created',
'description' => 'New Test Group Created',
'source' => '',
'saved_search_id' => '',
'is_active' => '1',
'visibility' => 'Public Pages',
- 'where_clause' => ' ( `civicrm_group_contact-1`.group_id IN ( 1 ) AND `civicrm_group_contact-1`.status IN ("Added") ) ',
- 'select_tables' => 'a:8:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:25:"`civicrm_group_contact-1`";s:114:" LEFT JOIN civicrm_group_contact `civicrm_group_contact-1` ON contact_a.id = `civicrm_group_contact-1`.contact_id ";}',
- 'where_tables' => 'a:2:{s:15:"civicrm_contact";i:1;s:25:"`civicrm_group_contact-1`";s:114:" LEFT JOIN civicrm_group_contact `civicrm_group_contact-1` ON contact_a.id = `civicrm_group_contact-1`.contact_id ";}',
+ 'where_clause' => ' ( `civicrm_group_contact-1`.group_id IN ( 1 ) AND `civicrm_group_contact-1`.status IN (\"Added\") ) ',
+ 'select_tables' => 'a:8:{s:15:\"civicrm_contact\";i:1;s:15:\"civicrm_address\";i:1;s:15:\"civicrm_country\";i:1;s:13:\"civicrm_email\";i:1;s:13:\"civicrm_phone\";i:1;s:10:\"civicrm_im\";i:1;s:19:\"civicrm_worldregion\";i:1;s:25:\"`civicrm_group_contact-1`\";s:165:\" LEFT JOIN civicrm_group_contact `civicrm_group_contact-1` ON ( contact_a.id = `civicrm_group_contact-1`.contact_id AND `civicrm_group_contact-1`.group_id IN ( 1 ) )\";}',
+ 'where_tables' => 'a:2:{s:15:\"civicrm_contact\";i:1;s:25:\"`civicrm_group_contact-1`\";s:165:\" LEFT JOIN civicrm_group_contact `civicrm_group_contact-1` ON ( contact_a.id = `civicrm_group_contact-1`.contact_id AND `civicrm_group_contact-1`.group_id IN ( 1 ) )\";}',
'group_type' => array(
'0' => '1',
'1' => '2',
@@ -137,4 +137,4 @@ function group_contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GroupContactCreate.php b/api/v3/examples/GroupContactCreate.php
index 309c0edfcf0319ab0561f90c797b48010ffa2a30..0ca453a5576dd164dfb986fc5cb055aecb60905e 100644
--- a/api/v3/examples/GroupContactCreate.php
+++ b/api/v3/examples/GroupContactCreate.php
@@ -63,4 +63,4 @@ function group_contact_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GroupContactDelete.php b/api/v3/examples/GroupContactDelete.php
index 44efa758da69ce176aa7d6e046fe41dc8fee963e..0a8f9041794d794a2798a4867c3134a431933d5f 100644
--- a/api/v3/examples/GroupContactDelete.php
+++ b/api/v3/examples/GroupContactDelete.php
@@ -62,4 +62,4 @@ function group_contact_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GroupContactGet.php b/api/v3/examples/GroupContactGet.php
index d808dc118a2f9dc7d1ab992e691f403a3790c7ac..81ac2d8f62c18fafb4f3978b42d3bfcb7a82d383 100644
--- a/api/v3/examples/GroupContactGet.php
+++ b/api/v3/examples/GroupContactGet.php
@@ -69,4 +69,4 @@ function group_contact_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GroupGet.php b/api/v3/examples/GroupGet.php
index 814907546a28f485fe6a2f86301a09540d4b0af8..4256303445839b297c80dd40cdffbc69853b2f38 100644
--- a/api/v3/examples/GroupGet.php
+++ b/api/v3/examples/GroupGet.php
@@ -5,7 +5,7 @@
*/
function group_get_example(){
$params = array(
- 'name' => 'Test Group 1_4',
+ 'name' => 'Test Group 1',
);
try{
@@ -35,16 +35,16 @@ function group_get_expectedresult(){
'values' => array(
'4' => array(
'id' => '4',
- 'name' => 'Test Group 1_4',
+ 'name' => 'Test Group 1',
'title' => 'New Test Group Created',
'description' => 'New Test Group Created',
'source' => '',
'saved_search_id' => '',
'is_active' => '1',
'visibility' => 'Public Pages',
- 'where_clause' => ' ( `civicrm_group_contact-4`.group_id IN ( 4 ) AND `civicrm_group_contact-4`.status IN ("Added") ) ',
- 'select_tables' => 'a:8:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:25:"`civicrm_group_contact-4`";s:114:" LEFT JOIN civicrm_group_contact `civicrm_group_contact-4` ON contact_a.id = `civicrm_group_contact-4`.contact_id ";}',
- 'where_tables' => 'a:2:{s:15:"civicrm_contact";i:1;s:25:"`civicrm_group_contact-4`";s:114:" LEFT JOIN civicrm_group_contact `civicrm_group_contact-4` ON contact_a.id = `civicrm_group_contact-4`.contact_id ";}',
+ 'where_clause' => ' ( `civicrm_group_contact-4`.group_id IN ( 4 ) AND `civicrm_group_contact-4`.status IN (\"Added\") ) ',
+ 'select_tables' => 'a:8:{s:15:\"civicrm_contact\";i:1;s:15:\"civicrm_address\";i:1;s:15:\"civicrm_country\";i:1;s:13:\"civicrm_email\";i:1;s:13:\"civicrm_phone\";i:1;s:10:\"civicrm_im\";i:1;s:19:\"civicrm_worldregion\";i:1;s:25:\"`civicrm_group_contact-4`\";s:165:\" LEFT JOIN civicrm_group_contact `civicrm_group_contact-4` ON ( contact_a.id = `civicrm_group_contact-4`.contact_id AND `civicrm_group_contact-4`.group_id IN ( 4 ) )\";}',
+ 'where_tables' => 'a:2:{s:15:\"civicrm_contact\";i:1;s:25:\"`civicrm_group_contact-4`\";s:165:\" LEFT JOIN civicrm_group_contact `civicrm_group_contact-4` ON ( contact_a.id = `civicrm_group_contact-4`.contact_id AND `civicrm_group_contact-4`.group_id IN ( 4 ) )\";}',
'group_type' => array(
'0' => '1',
'1' => '2',
@@ -84,4 +84,4 @@ function group_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GroupNestingCreate.php b/api/v3/examples/GroupNestingCreate.php
index d6464fb8df5d4bef810aef045565428b2dd46a11..04464adf0726cc5cc6ce019de273a3931a776d2d 100644
--- a/api/v3/examples/GroupNestingCreate.php
+++ b/api/v3/examples/GroupNestingCreate.php
@@ -62,4 +62,4 @@ function group_nesting_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GroupNestingDelete.php b/api/v3/examples/GroupNestingDelete.php
index f62acbbe7b4376111efc22ba6f701fca5983636e..4663f2eaebb191ad03d0ea89b5d70626603042cc 100644
--- a/api/v3/examples/GroupNestingDelete.php
+++ b/api/v3/examples/GroupNestingDelete.php
@@ -58,4 +58,4 @@ function group_nesting_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/GroupNestingGet.php b/api/v3/examples/GroupNestingGet.php
index 331b593c0603769e5176e961bb0659ca75f2c60f..2cde6e469ef96af26f43044bbfe3f89ecd0588d5 100644
--- a/api/v3/examples/GroupNestingGet.php
+++ b/api/v3/examples/GroupNestingGet.php
@@ -66,4 +66,4 @@ function group_nesting_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ImCreate.php b/api/v3/examples/ImCreate.php
index 260d0a83a9c7daf226b6ab51efd292f5e110c5e6..1b4116dc0f9727690ef76e3a598a3ee8d3a1af4a 100644
--- a/api/v3/examples/ImCreate.php
+++ b/api/v3/examples/ImCreate.php
@@ -72,4 +72,4 @@ function im_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ImDelete.php b/api/v3/examples/ImDelete.php
index d74fc3ab499d642a32733ed41b022bbd374e1e7b..3ff80a64902b8b54ee2e21390b45e32387cf5d2b 100644
--- a/api/v3/examples/ImDelete.php
+++ b/api/v3/examples/ImDelete.php
@@ -58,4 +58,4 @@ function im_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ImGet.php b/api/v3/examples/ImGet.php
index eec5230a7c034e46d83fdaa9bd90aa766ab3fb2c..d63f3a597dc8426fb33765ae752975e83ea0da0e 100644
--- a/api/v3/examples/ImGet.php
+++ b/api/v3/examples/ImGet.php
@@ -72,4 +72,4 @@ function im_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/LineItemCreate.php b/api/v3/examples/LineItemCreate.php
index 610970e4891daabee61b9f232b58ac16d163a870..da9283de44dc05c948148187b6698f7519321546 100644
--- a/api/v3/examples/LineItemCreate.php
+++ b/api/v3/examples/LineItemCreate.php
@@ -81,4 +81,4 @@ function line_item_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/LineItemDelete.php b/api/v3/examples/LineItemDelete.php
index 4df6f07b5ffa4690644451aa53b00fe4b902ff53..8553e93b852cc52679be3ee0faa2d17ceed2d153 100644
--- a/api/v3/examples/LineItemDelete.php
+++ b/api/v3/examples/LineItemDelete.php
@@ -58,4 +58,4 @@ function line_item_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/LineItemGet.php b/api/v3/examples/LineItemGet.php
index d31b9e8474c5eeeccc6d31af252bdd69919fa3b5..3d5af2fea74c94b1bfcce1c97a2399da0172fdc6 100644
--- a/api/v3/examples/LineItemGet.php
+++ b/api/v3/examples/LineItemGet.php
@@ -73,4 +73,4 @@ function line_item_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/LocBlockCreate.php b/api/v3/examples/LocBlockCreate.php
index 61ecaaf53c2571145db76601dd33b15f9b71b7a7..7f893f4d351ba5e333fa305937f1f531a8e3271b 100644
--- a/api/v3/examples/LocBlockCreate.php
+++ b/api/v3/examples/LocBlockCreate.php
@@ -73,4 +73,4 @@ function loc_block_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/LocBlockCreateEntities.php b/api/v3/examples/LocBlockCreateEntities.php
index 7d28bce873eb63ccfa0b5ffb612eae0b8b7a9391..dad0145a108a589d8d808557c014b12c8fb014a8 100644
--- a/api/v3/examples/LocBlockCreateEntities.php
+++ b/api/v3/examples/LocBlockCreateEntities.php
@@ -132,4 +132,4 @@ function loc_block_createentities_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/LocBlockGet.php b/api/v3/examples/LocBlockGet.php
index 870dbe84d55dc30960d0fcb7a2ffa6aff6756baf..ec9c0375fcc029c7c2571342b6a7874209f666c5 100644
--- a/api/v3/examples/LocBlockGet.php
+++ b/api/v3/examples/LocBlockGet.php
@@ -93,4 +93,4 @@ function loc_block_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MailSettings/ChainedGetDelete.php b/api/v3/examples/MailSettings/ChainedGetDelete.php
index 7c8690d76ce59c8962c82b9dc5f32336e750bca5..f2987d980d0df74fe406abd2556951ef573266ff 100644
--- a/api/v3/examples/MailSettings/ChainedGetDelete.php
+++ b/api/v3/examples/MailSettings/ChainedGetDelete.php
@@ -90,4 +90,4 @@ function mail_settings_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MailSettingsCreate.php b/api/v3/examples/MailSettingsCreate.php
index 072e60d2a533e17a5334787cb94e3ca64fe3e8c9..a9600c980e318a473b9de50b6b1b7ed9f641e651 100644
--- a/api/v3/examples/MailSettingsCreate.php
+++ b/api/v3/examples/MailSettingsCreate.php
@@ -82,4 +82,4 @@ function mail_settings_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MailSettingsDelete.php b/api/v3/examples/MailSettingsDelete.php
index b062459b55f6a9764d8217e52b2da778925d5435..984f0c54a0339f32ca808aa10f8ad8d4d96bd286 100644
--- a/api/v3/examples/MailSettingsDelete.php
+++ b/api/v3/examples/MailSettingsDelete.php
@@ -58,4 +58,4 @@ function mail_settings_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MailSettingsGet.php b/api/v3/examples/MailSettingsGet.php
index 69959acc521f745b2d3421ff47c1667f7fb4c2f7..881dec97c739c7d72ea91c5a06d3e72140b97c3a 100644
--- a/api/v3/examples/MailSettingsGet.php
+++ b/api/v3/examples/MailSettingsGet.php
@@ -77,4 +77,4 @@ function mail_settings_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MailingGroupSubscribe.php b/api/v3/examples/MailingGroupSubscribe.php
index ef287f111ddda481e3e895face0f18129c30d1c6..f77089312d56025ce3b6802a6a5070ca8778b99f 100644
--- a/api/v3/examples/MailingGroupSubscribe.php
+++ b/api/v3/examples/MailingGroupSubscribe.php
@@ -69,4 +69,4 @@ function mailing_group_subscribe_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Membership/filterIsCurrent.php b/api/v3/examples/Membership/filterIsCurrent.php
index e014948de674601d10bfb3c8a1566fcb2796f05f..45c6b9666a15ea19bed4a8b057a4b47eec1f3d48 100644
--- a/api/v3/examples/Membership/filterIsCurrent.php
+++ b/api/v3/examples/Membership/filterIsCurrent.php
@@ -85,4 +85,4 @@ function membership_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipCreate.php b/api/v3/examples/MembershipCreate.php
index 6ab9557be84d0d141ed0d6406409f7963a83eeea..ca99bc3ee98fffcf83e97575f1c9120fba2bee2d 100644
--- a/api/v3/examples/MembershipCreate.php
+++ b/api/v3/examples/MembershipCreate.php
@@ -85,4 +85,4 @@ function membership_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipDelete.php b/api/v3/examples/MembershipDelete.php
index cd2426bcb841abca1948721c9f0dfa6a3688e864..306e73ba923fef76e0e118f729264d0fbc54d2bc 100644
--- a/api/v3/examples/MembershipDelete.php
+++ b/api/v3/examples/MembershipDelete.php
@@ -58,4 +58,4 @@ function membership_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipGet.php b/api/v3/examples/MembershipGet.php
index 315ff70e93a9b244e88f7def9b4a6e5e7c6fa9c5..095255074c320ef479a04ccd50a788bd0781f620 100644
--- a/api/v3/examples/MembershipGet.php
+++ b/api/v3/examples/MembershipGet.php
@@ -77,4 +77,4 @@ function membership_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipPaymentCreate.php b/api/v3/examples/MembershipPaymentCreate.php
index d58e0e13469a2f25cdc315ea10ed1ca0feda2ab4..7c69a98b65aa731fd13bd0e7049bca0c21ab7ab4 100644
--- a/api/v3/examples/MembershipPaymentCreate.php
+++ b/api/v3/examples/MembershipPaymentCreate.php
@@ -66,4 +66,4 @@ function membership_payment_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipPaymentGet.php b/api/v3/examples/MembershipPaymentGet.php
index c1bc97bc87181f5af25f71e97a51ff1ea582beeb..96f662c595a660e5b2edecb811688d1f3342b829 100644
--- a/api/v3/examples/MembershipPaymentGet.php
+++ b/api/v3/examples/MembershipPaymentGet.php
@@ -66,4 +66,4 @@ function membership_payment_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipStatusCreate.php b/api/v3/examples/MembershipStatusCreate.php
index fd17f8549762a3ef58412fb86f03b4a9865fe201..9f5323550b218e61c4cd64dc98e1f7f232a6f5b8 100644
--- a/api/v3/examples/MembershipStatusCreate.php
+++ b/api/v3/examples/MembershipStatusCreate.php
@@ -77,4 +77,4 @@ function membership_status_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipStatusGet.php b/api/v3/examples/MembershipStatusGet.php
index 3de04001feb8521ac89cd9b975e03925e2d015ad..d19e778d9fce5270b7a15093483a0dd9666fb948 100644
--- a/api/v3/examples/MembershipStatusGet.php
+++ b/api/v3/examples/MembershipStatusGet.php
@@ -72,4 +72,4 @@ function membership_status_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipTypeCreate.php b/api/v3/examples/MembershipTypeCreate.php
index 3eca2da079d4b3438ab765558660c1c844ddb40a..0c6c25e364cb3e0781837b33ea652897075f2b7f 100644
--- a/api/v3/examples/MembershipTypeCreate.php
+++ b/api/v3/examples/MembershipTypeCreate.php
@@ -93,4 +93,4 @@ function membership_type_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipTypeDelete.php b/api/v3/examples/MembershipTypeDelete.php
index 8baab176e284aec9a7c350498bdf71bae6d48779..4d9e32c8272e89fd8d21ae14a6c11690f479865f 100644
--- a/api/v3/examples/MembershipTypeDelete.php
+++ b/api/v3/examples/MembershipTypeDelete.php
@@ -58,4 +58,4 @@ function membership_type_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipTypeGet.php b/api/v3/examples/MembershipTypeGet.php
index 8bcb08be2a06c8d74fde06306c87b846ffe86637..92a487f2f352f053e753186a7f802def77f275ee 100644
--- a/api/v3/examples/MembershipTypeGet.php
+++ b/api/v3/examples/MembershipTypeGet.php
@@ -74,4 +74,4 @@ function membership_type_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MembershipUpdate.php b/api/v3/examples/MembershipUpdate.php
index dbe01b116f2471f9c898cb11dcd24dfbc3a7b36e..23f3035f4ef3864b9eb88f7a7619d335a9b93c60 100644
--- a/api/v3/examples/MembershipUpdate.php
+++ b/api/v3/examples/MembershipUpdate.php
@@ -85,4 +85,4 @@ function membership_update_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MessageTemplateCreate.php b/api/v3/examples/MessageTemplateCreate.php
index d870a5b1f8cde58efb0352d684bdaee45311cbb8..a37efa4701dd20a6368a134f865c7908ad4c0a44 100644
--- a/api/v3/examples/MessageTemplateCreate.php
+++ b/api/v3/examples/MessageTemplateCreate.php
@@ -5,11 +5,11 @@
*/
function message_template_create_example(){
$params = array(
- 'msg_title' => 'msg_title_1',
- 'msg_subject' => 'msg_subject_1',
- 'msg_text' => 'msg_text_1',
- 'msg_html' => 'msg_html_1',
- 'workflow_id' => 1,
+ 'msg_title' => 'msg_title_55',
+ 'msg_subject' => 'msg_subject_55',
+ 'msg_text' => 'msg_text_55',
+ 'msg_html' => 'msg_html_55',
+ 'workflow_id' => 55,
'is_default' => '1',
'is_reserved' => 1,
'pdf_format_id' => '1',
@@ -42,12 +42,12 @@ function message_template_create_expectedresult(){
'values' => array(
'2' => array(
'id' => '2',
- 'msg_title' => 'msg_title_1',
- 'msg_subject' => 'msg_subject_1',
- 'msg_text' => 'msg_text_1',
- 'msg_html' => 'msg_html_1',
+ 'msg_title' => 'msg_title_55',
+ 'msg_subject' => 'msg_subject_55',
+ 'msg_text' => 'msg_text_55',
+ 'msg_html' => 'msg_html_55',
'is_active' => '1',
- 'workflow_id' => '1',
+ 'workflow_id' => '55',
'is_default' => '1',
'is_reserved' => '1',
'pdf_format_id' => '1',
@@ -79,4 +79,4 @@ function message_template_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MessageTemplateDelete.php b/api/v3/examples/MessageTemplateDelete.php
index 6bb981cc05dfdd9085cd420c5c59d902f0850ec5..03f27d77f5da9bae61d511dc79600a62436598f6 100644
--- a/api/v3/examples/MessageTemplateDelete.php
+++ b/api/v3/examples/MessageTemplateDelete.php
@@ -58,4 +58,4 @@ function message_template_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/MessageTemplateGet.php b/api/v3/examples/MessageTemplateGet.php
index f238f69299866194231d565ad379995306e7583e..aaf42ad7a238ae58c7ef88e98ad0f7f5e320d482 100644
--- a/api/v3/examples/MessageTemplateGet.php
+++ b/api/v3/examples/MessageTemplateGet.php
@@ -5,11 +5,11 @@
*/
function message_template_get_example(){
$params = array(
- 'msg_title' => 'msg_title_2',
- 'msg_subject' => 'msg_subject_2',
- 'msg_text' => 'msg_text_2',
- 'msg_html' => 'msg_html_2',
- 'workflow_id' => 2,
+ 'msg_title' => 'msg_title_56',
+ 'msg_subject' => 'msg_subject_56',
+ 'msg_text' => 'msg_text_56',
+ 'msg_html' => 'msg_html_56',
+ 'workflow_id' => 56,
'is_default' => '1',
'is_reserved' => 1,
'pdf_format_id' => '1',
@@ -42,12 +42,12 @@ function message_template_get_expectedresult(){
'values' => array(
'1' => array(
'id' => '1',
- 'msg_title' => 'msg_title_2',
- 'msg_subject' => 'msg_subject_2',
- 'msg_text' => 'msg_text_2',
- 'msg_html' => 'msg_html_2',
+ 'msg_title' => 'msg_title_56',
+ 'msg_subject' => 'msg_subject_56',
+ 'msg_text' => 'msg_text_56',
+ 'msg_html' => 'msg_html_56',
'is_active' => '1',
- 'workflow_id' => '2',
+ 'workflow_id' => '56',
'is_default' => '1',
'is_reserved' => '1',
'pdf_format_id' => '1',
@@ -79,4 +79,4 @@ function message_template_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/NoteCreate.php b/api/v3/examples/NoteCreate.php
index 469f4087367b08cf900adc0b06db2c558800d227..a4be069077ab97f24b542927c91f31ac459aa105 100644
--- a/api/v3/examples/NoteCreate.php
+++ b/api/v3/examples/NoteCreate.php
@@ -75,4 +75,4 @@ function note_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/NoteDelete.php b/api/v3/examples/NoteDelete.php
index e8933772c00e806493a3c4a64202d5fe2a74cec2..2ad22cf231defa9f7e11aeff93429f2166875740 100644
--- a/api/v3/examples/NoteDelete.php
+++ b/api/v3/examples/NoteDelete.php
@@ -58,4 +58,4 @@ function note_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/NoteGet.php b/api/v3/examples/NoteGet.php
index ebd17d2fe47512e1d8142f25927cee2b448a37a1..3f08acfd8cbcdc62590499e7156b65f9e540f2c3 100644
--- a/api/v3/examples/NoteGet.php
+++ b/api/v3/examples/NoteGet.php
@@ -71,4 +71,4 @@ function note_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/OptionGroupCreate.php b/api/v3/examples/OptionGroupCreate.php
index 32097c168202aa0c7d037eb1da1b86e46ef52564..c17c5daeaccb53c890df9830311ba5026af6bd7f 100644
--- a/api/v3/examples/OptionGroupCreate.php
+++ b/api/v3/examples/OptionGroupCreate.php
@@ -50,7 +50,7 @@ function option_group_create_expectedresult(){
'description' => '',
'is_reserved' => '1',
'is_active' => '1',
- 'api.OptionValue.create' => 722,
+ 'api.OptionValue.create' => 727,
),
),
);
@@ -79,4 +79,4 @@ function option_group_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/OptionGroupDelete.php b/api/v3/examples/OptionGroupDelete.php
index 5a40f3e5abfb9d3f5b61cb8fa3e4040f7484843e..ae01aee0dde03d08af2e7c0339e7d094fbae9dc5 100644
--- a/api/v3/examples/OptionGroupDelete.php
+++ b/api/v3/examples/OptionGroupDelete.php
@@ -58,4 +58,4 @@ function option_group_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/OptionGroupGet.php b/api/v3/examples/OptionGroupGet.php
index 735b63968905deca383fb4bf4cbde32a986468dc..07e50a67db69b6b71b33a726375c4b6877f85b78 100644
--- a/api/v3/examples/OptionGroupGet.php
+++ b/api/v3/examples/OptionGroupGet.php
@@ -67,4 +67,4 @@ function option_group_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/OptionValueGet.php b/api/v3/examples/OptionValueGet.php
index 9e02dc309f6bc2f52b50206dce64e3370dc9cf05..5490d6c3b912ec900de356a5ed93bfdbdbe0fdfa 100644
--- a/api/v3/examples/OptionValueGet.php
+++ b/api/v3/examples/OptionValueGet.php
@@ -114,4 +114,4 @@ function option_value_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Participant/CreateParticipantPayment.php b/api/v3/examples/Participant/CreateParticipantPayment.php
index 1242fe3a83ec806f266a1298fe6a49c93e1b29c6..5135dda0029dcdf3c485752381f96d08fc3426c4 100644
--- a/api/v3/examples/Participant/CreateParticipantPayment.php
+++ b/api/v3/examples/Participant/CreateParticipantPayment.php
@@ -141,4 +141,4 @@ function participant_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Participant/NestedDelete.php b/api/v3/examples/Participant/NestedDelete.php
index 29e716316199148a9737293d10e54a9163aeb078..1cd158e8e7058bc2ec5c58cb4dd4261ee54c99cc 100644
--- a/api/v3/examples/Participant/NestedDelete.php
+++ b/api/v3/examples/Participant/NestedDelete.php
@@ -128,4 +128,4 @@ function participant_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Participant/NestedEventGet.php b/api/v3/examples/Participant/NestedEventGet.php
index 31eaf2fa9c2e72c567512bd77a4c8e3f40b9aef4..4dd48950fe995257be18521fb492b9a0423f7e4f 100644
--- a/api/v3/examples/Participant/NestedEventGet.php
+++ b/api/v3/examples/Participant/NestedEventGet.php
@@ -130,4 +130,4 @@ function participant_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ParticipantCreate.php b/api/v3/examples/ParticipantCreate.php
index 735322b0c97611957fe48dd553503b2dff4e4c41..3867daa954bfdcc19a5b31db51558970ee1eeacf 100644
--- a/api/v3/examples/ParticipantCreate.php
+++ b/api/v3/examples/ParticipantCreate.php
@@ -86,4 +86,4 @@ function participant_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ParticipantGet.php b/api/v3/examples/ParticipantGet.php
index f2f775231727141d21838aac530a093682fa94a8..a3808c72764393b676163cb2a197294b0db14c82 100644
--- a/api/v3/examples/ParticipantGet.php
+++ b/api/v3/examples/ParticipantGet.php
@@ -88,4 +88,4 @@ function participant_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ParticipantPaymentCreate.php b/api/v3/examples/ParticipantPaymentCreate.php
index 3e1b68ed03e94e8528a7e0608a417185338635d7..ed2ec4b8f7f31bd2ae54d80f479edf7924ce7edd 100644
--- a/api/v3/examples/ParticipantPaymentCreate.php
+++ b/api/v3/examples/ParticipantPaymentCreate.php
@@ -66,4 +66,4 @@ function participant_payment_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ParticipantPaymentDelete.php b/api/v3/examples/ParticipantPaymentDelete.php
index b0a938ff2ca63bad0ffbdb2ac64b9ba5b382e054..71e4c5708504ba1753de27012074da557ab022b7 100644
--- a/api/v3/examples/ParticipantPaymentDelete.php
+++ b/api/v3/examples/ParticipantPaymentDelete.php
@@ -58,4 +58,4 @@ function participant_payment_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ParticipantPaymentGet.php b/api/v3/examples/ParticipantPaymentGet.php
index 4f2d73a8eeb98e0f3064fb366fd833cb31036489..e520aa47538729c040a6e24a73d4a9db376696da 100644
--- a/api/v3/examples/ParticipantPaymentGet.php
+++ b/api/v3/examples/ParticipantPaymentGet.php
@@ -66,4 +66,4 @@ function participant_payment_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ParticipantStatusTypeCreate.php b/api/v3/examples/ParticipantStatusTypeCreate.php
index 8ddd44e15d8bf195b1c7c5b223fdecd60e2ea436..ba3d10de0ea1a9a76ceb4131de030137310c7adb 100644
--- a/api/v3/examples/ParticipantStatusTypeCreate.php
+++ b/api/v3/examples/ParticipantStatusTypeCreate.php
@@ -78,4 +78,4 @@ function participant_status_type_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ParticipantStatusTypeDelete.php b/api/v3/examples/ParticipantStatusTypeDelete.php
index 7f40197884b28a887630a72d112cdcc3005606cc..4421ce399c98721def92fb70906b49bfa618cb8c 100644
--- a/api/v3/examples/ParticipantStatusTypeDelete.php
+++ b/api/v3/examples/ParticipantStatusTypeDelete.php
@@ -58,4 +58,4 @@ function participant_status_type_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ParticipantStatusTypeGet.php b/api/v3/examples/ParticipantStatusTypeGet.php
index 1b170f6adfbde7ce1891c1f4c7510202a47d821b..ae29aae7773f306dfb3614c99c4b8b35ae5ecff0 100644
--- a/api/v3/examples/ParticipantStatusTypeGet.php
+++ b/api/v3/examples/ParticipantStatusTypeGet.php
@@ -78,4 +78,4 @@ function participant_status_type_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PaymentProcessorCreate.php b/api/v3/examples/PaymentProcessorCreate.php
index 355335619087fa4fa09a900d70dbebde1771db4f..b98cb3013c305ffaf397d2448444c07191863bf4 100644
--- a/api/v3/examples/PaymentProcessorCreate.php
+++ b/api/v3/examples/PaymentProcessorCreate.php
@@ -86,4 +86,4 @@ function payment_processor_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PaymentProcessorDelete.php b/api/v3/examples/PaymentProcessorDelete.php
index 392986fa5bd98c95769bbff5ac8881ac7ea037e6..eb478d901142688bbf24e678bdbd00362ab96e56 100644
--- a/api/v3/examples/PaymentProcessorDelete.php
+++ b/api/v3/examples/PaymentProcessorDelete.php
@@ -58,4 +58,4 @@ function payment_processor_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PaymentProcessorTypeCreate.php b/api/v3/examples/PaymentProcessorTypeCreate.php
index 3159cd3a41c5e98f3d5e3c23ebc7e5b67457c0c7..2ec3ac5b8468207a80e90c0814b401698c301300 100644
--- a/api/v3/examples/PaymentProcessorTypeCreate.php
+++ b/api/v3/examples/PaymentProcessorTypeCreate.php
@@ -89,4 +89,4 @@ function payment_processor_type_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PaymentProcessorTypeDelete.php b/api/v3/examples/PaymentProcessorTypeDelete.php
index 2d8b47f8d31942b80e00453f761fc0788baf4254..9c8eac1cfe6134faa1d80b7c426294303495ab36 100644
--- a/api/v3/examples/PaymentProcessorTypeDelete.php
+++ b/api/v3/examples/PaymentProcessorTypeDelete.php
@@ -58,4 +58,4 @@ function payment_processor_type_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PhoneCreate.php b/api/v3/examples/PhoneCreate.php
index 7a2b6c860423b1b6f68c10e205d63ba9abc21d0b..6a9329e272cde4a2d263fc061005936f536ff7a2 100644
--- a/api/v3/examples/PhoneCreate.php
+++ b/api/v3/examples/PhoneCreate.php
@@ -76,4 +76,4 @@ function phone_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PhoneDelete.php b/api/v3/examples/PhoneDelete.php
index d5dc2f2d9bc4ac5bed69d4f154e501761bca2b23..15c07e9d3e1db0276d6fd1d6c677ce3194a4f513 100644
--- a/api/v3/examples/PhoneDelete.php
+++ b/api/v3/examples/PhoneDelete.php
@@ -58,4 +58,4 @@ function phone_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PhoneGet.php b/api/v3/examples/PhoneGet.php
index a590a57046071e712bc8ed32d594fddc02a2d3ed..3cab0f1a09b1e6bd5485aadb4d0a92abbf53344c 100644
--- a/api/v3/examples/PhoneGet.php
+++ b/api/v3/examples/PhoneGet.php
@@ -71,4 +71,4 @@ function phone_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Pledge/GetFilterHighDate.php b/api/v3/examples/Pledge/GetFilterHighDate.php
index 8534a0a14911191dea98476666eb686ea744f751..487fac43ad95c09287a20ef2d6a56630accfd3c3 100644
--- a/api/v3/examples/Pledge/GetFilterHighDate.php
+++ b/api/v3/examples/Pledge/GetFilterHighDate.php
@@ -5,7 +5,7 @@
*/
function pledge_get_example(){
$params = array(
- 'pledge_start_date_high' => '20130801213843',
+ 'pledge_start_date_high' => '20140118110150',
);
try{
@@ -41,10 +41,10 @@ function pledge_get_expectedresult(){
'display_name' => 'Mr. Anthony Anderson II',
'pledge_id' => '2',
'pledge_amount' => '100.00',
- 'pledge_create_date' => '2013-08-03 00:00:00',
+ 'pledge_create_date' => '2014-01-20 00:00:00',
'pledge_status' => 'Overdue',
'pledge_total_paid' => '',
- 'pledge_next_pay_date' => '2012-03-02 00:00:00',
+ 'pledge_next_pay_date' => '2013-03-01 00:00:00',
'pledge_next_pay_amount' => '20.00',
'pledge_outstanding_amount' => '20.00',
'pledge_financial_type' => 'Donation',
@@ -83,4 +83,4 @@ function pledge_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PledgeCreate.php b/api/v3/examples/PledgeCreate.php
index fece5a44d6e100c6f7a184d4495c1a5791635f27..057a0d864e73c4939e9ffc95c78b963c11db571b 100644
--- a/api/v3/examples/PledgeCreate.php
+++ b/api/v3/examples/PledgeCreate.php
@@ -6,9 +6,9 @@
function pledge_create_example(){
$params = array(
'contact_id' => 11,
- 'pledge_create_date' => '20130803',
- 'start_date' => '20130803',
- 'scheduled_date' => '20130805',
+ 'pledge_create_date' => '20140120',
+ 'start_date' => '20140120',
+ 'scheduled_date' => '20140122',
'amount' => '100',
'pledge_status_id' => '2',
'pledge_financial_type_id' => '1',
@@ -99,4 +99,4 @@ function pledge_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PledgeDelete.php b/api/v3/examples/PledgeDelete.php
index d83fa0e8bd8c30fd3ac2d5e34240554cedc94b36..e519ae4457f47b301732e8932810f5cf83ef904c 100644
--- a/api/v3/examples/PledgeDelete.php
+++ b/api/v3/examples/PledgeDelete.php
@@ -61,4 +61,4 @@ function pledge_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PledgeGet.php b/api/v3/examples/PledgeGet.php
index 8fa605ca09cbada1230cf2449e0824c46d90d90b..8443c398ad453893b8ed3c3edd1ba8ce99295e9a 100644
--- a/api/v3/examples/PledgeGet.php
+++ b/api/v3/examples/PledgeGet.php
@@ -41,10 +41,10 @@ function pledge_get_expectedresult(){
'display_name' => 'Mr. Anthony Anderson II',
'pledge_id' => '1',
'pledge_amount' => '100.00',
- 'pledge_create_date' => '2013-08-03 00:00:00',
+ 'pledge_create_date' => '2014-01-20 00:00:00',
'pledge_status' => 'Pending',
'pledge_total_paid' => '',
- 'pledge_next_pay_date' => '2013-08-05 00:00:00',
+ 'pledge_next_pay_date' => '2014-01-22 00:00:00',
'pledge_next_pay_amount' => '20.00',
'pledge_outstanding_amount' => '',
'pledge_financial_type' => 'Donation',
@@ -83,4 +83,4 @@ function pledge_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PledgePaymentCreate.php b/api/v3/examples/PledgePaymentCreate.php
index d7b10206c85f44ccdbec0c22b3b55c9ff647fec6..689dabcf16cf29ace7decb10ea3efe6a28f7cd17 100644
--- a/api/v3/examples/PledgePaymentCreate.php
+++ b/api/v3/examples/PledgePaymentCreate.php
@@ -76,4 +76,4 @@ function pledge_payment_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PledgePaymentDelete.php b/api/v3/examples/PledgePaymentDelete.php
index 2ef5a94adb94f0f2d6a59c7540615024fadf6e96..66e4f7097df7c01883e74411fe4dbf0c257edfef 100644
--- a/api/v3/examples/PledgePaymentDelete.php
+++ b/api/v3/examples/PledgePaymentDelete.php
@@ -61,4 +61,4 @@ function pledge_payment_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PledgePaymentGet.php b/api/v3/examples/PledgePaymentGet.php
index 717fa75f5978faa1ea56dbcb546cd459feff494c..252cfbfc2e0d0f329b9361c8d2f71b147ac60201 100644
--- a/api/v3/examples/PledgePaymentGet.php
+++ b/api/v3/examples/PledgePaymentGet.php
@@ -102,4 +102,4 @@ function pledge_payment_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PledgePaymentUpdate.php b/api/v3/examples/PledgePaymentUpdate.php
index 1fa3a233d6bfa753ac2564152ddb4520ef6676d6..3eb388189fb183974f9caac74dc3e4b3801f3adc 100644
--- a/api/v3/examples/PledgePaymentUpdate.php
+++ b/api/v3/examples/PledgePaymentUpdate.php
@@ -73,4 +73,4 @@ function pledge_payment_update_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PriceFieldCreate.php b/api/v3/examples/PriceFieldCreate.php
index 1af45a971a783fe3a3b414dd378385a9bac694e5..6a48988e170d49d0b2f443d5e487f55f6a775786 100644
--- a/api/v3/examples/PriceFieldCreate.php
+++ b/api/v3/examples/PriceFieldCreate.php
@@ -84,4 +84,4 @@ function price_field_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PriceFieldDelete.php b/api/v3/examples/PriceFieldDelete.php
index bfcdba8ef58f105f338bee2ecb85a5f2684fe8d5..f592278701fe27e5c9afebdd5d82cd4b3ccad86e 100644
--- a/api/v3/examples/PriceFieldDelete.php
+++ b/api/v3/examples/PriceFieldDelete.php
@@ -58,4 +58,4 @@ function price_field_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PriceFieldGet.php b/api/v3/examples/PriceFieldGet.php
index 88d364e84bad548d8dee93d61fc49578bd11d812..82d855921122663eaf410197aa5ab8b3c1723e65 100644
--- a/api/v3/examples/PriceFieldGet.php
+++ b/api/v3/examples/PriceFieldGet.php
@@ -74,4 +74,4 @@ function price_field_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PriceFieldValueCreate.php b/api/v3/examples/PriceFieldValueCreate.php
index ba01b11d00278caaaf9c54afa4a4a5bf8e625505..284949d445814d1600192f0dd0e54c8258ae9428 100644
--- a/api/v3/examples/PriceFieldValueCreate.php
+++ b/api/v3/examples/PriceFieldValueCreate.php
@@ -85,4 +85,4 @@ function price_field_value_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PriceFieldValueDelete.php b/api/v3/examples/PriceFieldValueDelete.php
index 434665edb1ee4c71462cae34182ca7dbb21fd737..1b78e7df768f0ad17657562b8eb8d88c9bac91ba 100644
--- a/api/v3/examples/PriceFieldValueDelete.php
+++ b/api/v3/examples/PriceFieldValueDelete.php
@@ -58,4 +58,4 @@ function price_field_value_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PriceFieldValueGet.php b/api/v3/examples/PriceFieldValueGet.php
index c24d21c68155ab5a406d4e555ac2f41517bf1fd2..1673ca3ad878081f6d480e2766e2d4236ded5f16 100644
--- a/api/v3/examples/PriceFieldValueGet.php
+++ b/api/v3/examples/PriceFieldValueGet.php
@@ -72,4 +72,4 @@ function price_field_value_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PriceSetCreate.php b/api/v3/examples/PriceSetCreate.php
index 76fae688e51c229f4f78fb560733b73b2a215adc..86ed60f38a8b080ed184a390acc6b22fdf394f8f 100644
--- a/api/v3/examples/PriceSetCreate.php
+++ b/api/v3/examples/PriceSetCreate.php
@@ -82,4 +82,4 @@ function price_set_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PriceSetDelete.php b/api/v3/examples/PriceSetDelete.php
index bd84ef81e398067288640c74f0d8bc9886ad1380..f3b48565904230f47fb7168955294f08e8c3e17f 100644
--- a/api/v3/examples/PriceSetDelete.php
+++ b/api/v3/examples/PriceSetDelete.php
@@ -58,4 +58,4 @@ function price_set_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/PriceSetGet.php b/api/v3/examples/PriceSetGet.php
index 8e9f32090fd534bf7d64938d6221763552411123..4b1b48dde324f50df0b8ee0dc6719ba05e5d149d 100644
--- a/api/v3/examples/PriceSetGet.php
+++ b/api/v3/examples/PriceSetGet.php
@@ -70,4 +70,4 @@ function price_set_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ProfileApply.php b/api/v3/examples/ProfileApply.php
index 55c2c59230f8b6eedc918cb3a84451b504f67b29..0f57e1d820ce9d18e8adfe4445b0f66c64924b51 100644
--- a/api/v3/examples/ProfileApply.php
+++ b/api/v3/examples/ProfileApply.php
@@ -97,4 +97,4 @@ function profile_apply_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ProfileGet.php b/api/v3/examples/ProfileGet.php
index ae90235bbb5d9843ef0162ded4095a059da789db..e33c015049a7a07c490f6113e43577e6b7b566ae 100644
--- a/api/v3/examples/ProfileGet.php
+++ b/api/v3/examples/ProfileGet.php
@@ -95,4 +95,4 @@ function profile_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ProfileGetFields.php b/api/v3/examples/ProfileGetFields.php
index eff419870a5921a5c50987018226e7a5d9ef5864..5e6b5f047360dc83cab7173bc72a38e7ce673abb 100644
--- a/api/v3/examples/ProfileGetFields.php
+++ b/api/v3/examples/ProfileGetFields.php
@@ -33,85 +33,73 @@ function profile_getfields_expectedresult(){
'version' => 3,
'count' => 9,
'values' => array(
- 'first_name' => array(
- 'api.required' => '1',
- 'title' => 'First Name',
- 'help_pre' => '',
- 'help_post' => '',
- 'entity' => 'contact',
- 'name' => 'first_name',
+ 'custom_1' => array(
+ 'label' => '_addCustomFieldToProfile',
+ 'groupTitle' => '_addCustomFie',
+ 'data_type' => 'String',
+ 'html_type' => 'Text',
+ 'default_value' => 'defaultValue',
+ 'text_length' => '',
+ 'options_per_line' => '',
+ 'custom_group_id' => '1',
+ 'extends' => 'Contact',
+ 'is_search_range' => 0,
+ 'extends_entity_column_value' => '',
+ 'extends_entity_column_id' => '',
+ 'is_view' => 0,
+ 'is_multiple' => 0,
+ 'option_group_id' => '',
+ 'date_format' => '',
+ 'time_format' => '',
+ 'name' => 'custom_1',
'type' => 2,
- 'maxlength' => 64,
- 'size' => 30,
- 'import' => true,
- 'where' => 'civicrm_contact.first_name',
- 'headerPattern' => '/^first|(f(irst\s)?name)$/i',
- 'dataPattern' => '/^\w+$/',
- 'export' => true,
- 'api.aliases' => array(),
- ),
- 'last_name' => array(
'api.required' => '1',
- 'title' => 'Last Name',
+ 'title' => 'first_name',
'help_pre' => '',
'help_post' => '',
'entity' => 'contact',
- 'name' => 'last_name',
- 'type' => 2,
- 'maxlength' => 64,
- 'size' => 30,
- 'import' => true,
- 'where' => 'civicrm_contact.last_name',
- 'headerPattern' => '/^last|(l(ast\s)?name)$/i',
- 'dataPattern' => '/^\w+(\s\w+)?+$/',
- 'export' => true,
+ 'weight' => '1',
'api.aliases' => array(),
),
- 'email-primary' => array(
- 'api.required' => 1,
- 'title' => 'Email',
- 'help_pre' => '',
- 'help_post' => '',
- 'entity' => 'email',
- 'api.aliases' => array(
- '0' => 'email-Primary',
- ),
- 'name' => 'email',
+ 'postal_code-1' => array(
+ 'name' => 'postal_code',
'type' => 2,
- 'maxlength' => 254,
- 'size' => 20,
+ 'title' => 'State Province',
+ 'maxlength' => 12,
+ 'size' => 12,
'import' => true,
- 'where' => 'civicrm_email.email',
- 'headerPattern' => '/e.?mail/i',
- 'dataPattern' => '/^[a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/',
+ 'where' => 'civicrm_address.postal_code',
+ 'headerPattern' => '/postal|zip/i',
+ 'dataPattern' => '/\\d?\\d{4}(-\\d{4})?/',
'export' => true,
- 'rule' => 'email',
- ),
- 'phone-1-1' => array(
- 'api.required' => 1,
- 'title' => 'Phone',
+ 'api.required' => 0,
'help_pre' => '',
'help_post' => '',
- 'entity' => 'phone',
- 'name' => 'phone',
- 'type' => 2,
- 'maxlength' => 32,
- 'size' => 20,
- 'import' => true,
- 'where' => 'civicrm_phone.phone',
- 'headerPattern' => '/phone/i',
- 'dataPattern' => '/^[\d\(\)\-\.\s]+$/',
- 'export' => true,
+ 'entity' => 'address',
+ 'weight' => '2',
'api.aliases' => array(),
),
- 'country-1' => array(
+ 'state_province-1' => array(
+ 'name' => 'state_province_id',
+ 'type' => 1,
+ 'title' => 'State Province',
+ 'FKClassName' => 'CRM_Core_DAO_StateProvince',
+ 'pseudoconstant' => array(
+ 'table' => 'civicrm_state_province',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'name',
+ ),
'api.required' => '1',
- 'title' => 'Country',
'help_pre' => '',
'help_post' => '',
'entity' => 'address',
+ 'weight' => '3',
+ 'api.aliases' => array(),
+ ),
+ 'country-1' => array(
'name' => 'country_id',
'type' => 1,
+ 'title' => 'Country',
'FKClassName' => 'CRM_Core_DAO_Country',
'pseudoconstant' => array(
'table' => 'civicrm_country',
@@ -119,66 +107,86 @@ function profile_getfields_expectedresult(){
'labelColumn' => 'name',
'nameColumn' => 'iso_code',
),
+ 'api.required' => '1',
+ 'help_pre' => '',
+ 'help_post' => '',
+ 'entity' => 'address',
+ 'weight' => '4',
'api.aliases' => array(),
),
- 'state_province-1' => array(
+ 'phone-1-1' => array(
+ 'name' => 'phone',
+ 'type' => 2,
+ 'title' => 'Phone',
+ 'maxlength' => 32,
+ 'size' => 20,
+ 'import' => true,
+ 'where' => 'civicrm_phone.phone',
+ 'headerPattern' => '/phone/i',
+ 'dataPattern' => '/^[\\d\\(\\)\\-\\.\\s]+$/',
+ 'export' => true,
'api.required' => '1',
- 'title' => 'State',
'help_pre' => '',
'help_post' => '',
- 'entity' => 'address',
- 'name' => 'state_province_id',
- 'type' => 1,
- 'FKClassName' => 'CRM_Core_DAO_StateProvince',
- 'pseudoconstant' => array(
- 'table' => 'civicrm_state_province',
- 'keyColumn' => 'id',
- 'labelColumn' => 'name',
- ),
+ 'entity' => 'phone',
+ 'weight' => '5',
'api.aliases' => array(),
),
- 'postal_code-1' => array(
- 'api.required' => 0,
- 'title' => 'Postal Code',
+ 'email-primary' => array(
+ 'name' => 'email',
+ 'type' => 2,
+ 'title' => 'Email',
+ 'maxlength' => 254,
+ 'size' => 20,
+ 'import' => true,
+ 'where' => 'civicrm_email.email',
+ 'headerPattern' => '/e.?mail/i',
+ 'dataPattern' => '/^[a-zA-Z][\\w\\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\\w\\.-]*[a-zA-Z0-9]\\.[a-zA-Z][a-zA-Z\\.]*[a-zA-Z]$/',
+ 'export' => true,
+ 'rule' => 'email',
+ 'api.required' => '1',
'help_pre' => '',
'help_post' => '',
- 'entity' => 'address',
- 'name' => 'postal_code',
+ 'entity' => 'email',
+ 'weight' => '6',
+ 'api.aliases' => array(
+ '0' => 'email-Primary',
+ ),
+ ),
+ 'last_name' => array(
+ 'name' => 'last_name',
'type' => 2,
- 'maxlength' => 12,
- 'size' => 12,
+ 'title' => 'Last Name',
+ 'maxlength' => 64,
+ 'size' => 30,
'import' => true,
- 'where' => 'civicrm_address.postal_code',
- 'headerPattern' => '/postal|zip/i',
- 'dataPattern' => '/\d?\d{4}(-\d{4})?/',
+ 'where' => 'civicrm_contact.last_name',
+ 'headerPattern' => '/^last|(l(ast\\s)?name)$/i',
+ 'dataPattern' => '/^\\w+(\\s\\w+)?+$/',
'export' => true,
+ 'api.required' => '1',
+ 'help_pre' => '',
+ 'help_post' => '',
+ 'entity' => 'contact',
+ 'weight' => '7',
'api.aliases' => array(),
),
- 'custom_1' => array(
+ 'first_name' => array(
+ 'name' => 'first_name',
+ 'type' => 2,
+ 'title' => 'First Name',
+ 'maxlength' => 64,
+ 'size' => 30,
+ 'import' => true,
+ 'where' => 'civicrm_contact.first_name',
+ 'headerPattern' => '/^first|(f(irst\\s)?name)$/i',
+ 'dataPattern' => '/^\\w+$/',
+ 'export' => true,
'api.required' => '1',
- 'title' => 'first_name',
'help_pre' => '',
'help_post' => '',
'entity' => 'contact',
- 'label' => '_addCustomFieldToProfile',
- 'groupTitle' => '_addCustomFie',
- 'data_type' => 'String',
- 'html_type' => 'Text',
- 'default_value' => 'defaultValue',
- 'text_length' => '',
- 'options_per_line' => '',
- 'custom_group_id' => '1',
- 'extends' => 'Contact',
- 'is_search_range' => 0,
- 'extends_entity_column_value' => '',
- 'extends_entity_column_id' => '',
- 'is_view' => 0,
- 'is_multiple' => 0,
- 'option_group_id' => '',
- 'date_format' => '',
- 'time_format' => '',
- 'name' => 'custom_1',
- 'type' => 2,
+ 'weight' => '8',
'api.aliases' => array(),
),
'profile_id' => array(
@@ -211,4 +219,4 @@ function profile_getfields_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/ProfileSubmit.php b/api/v3/examples/ProfileSubmit.php
index 3d27cde1825538e84c75e1752514f29a41d512fc..05df843dae74009181345d83e4d2b5936117340e 100644
--- a/api/v3/examples/ProfileSubmit.php
+++ b/api/v3/examples/ProfileSubmit.php
@@ -53,7 +53,7 @@ function profile_submit_expectedresult(){
'legal_identifier' => '',
'external_identifier' => '',
'sort_name' => 'xyz2, abc2',
- 'display_name' => 'Mr. abc2 xyz2 II',
+ 'display_name' => 'abc2 xyz2',
'nick_name' => '',
'legal_name' => '',
'image_URL' => '',
@@ -77,6 +77,7 @@ function profile_submit_expectedresult(){
'addressee_custom' => '',
'addressee_display' => 'Mr. abc1 J. xyz1 II',
'job_title' => '',
+ 'gender_id' => '',
'birth_date' => '',
'is_deceased' => 0,
'deceased_date' => '',
@@ -115,4 +116,4 @@ function profile_submit_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/RelationshipTypeCreate.php b/api/v3/examples/RelationshipTypeCreate.php
index 46ffddb422d02c97848d025e28b16ac44fa6b72c..a1c83dfdda0e399076de2e08c5f819c8893fd49a 100644
--- a/api/v3/examples/RelationshipTypeCreate.php
+++ b/api/v3/examples/RelationshipTypeCreate.php
@@ -80,4 +80,4 @@ function relationship_type_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/RelationshipTypeDelete.php b/api/v3/examples/RelationshipTypeDelete.php
index 0d68292bf8325e4035f251100a75d1828148881b..6a538d4bcadce611999554879e34c4db6ba45b29 100644
--- a/api/v3/examples/RelationshipTypeDelete.php
+++ b/api/v3/examples/RelationshipTypeDelete.php
@@ -58,4 +58,4 @@ function relationship_type_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Survey/ChainedGetDelete.php b/api/v3/examples/Survey/ChainedGetDelete.php
index c68bab17dc9a907f842ac28e4d222c2f3a3a366d..0a66195e0b5cd1ce06923eab87406fba453f2aca 100644
--- a/api/v3/examples/Survey/ChainedGetDelete.php
+++ b/api/v3/examples/Survey/ChainedGetDelete.php
@@ -44,6 +44,7 @@ function survey_get_expectedresult(){
'is_default' => 0,
'created_date' => '2013-07-28 08:49:19',
'bypass_confirm' => 0,
+ 'is_share' => '1',
'api.survey.delete' => array(
'is_error' => 0,
'version' => 3,
@@ -78,4 +79,4 @@ function survey_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/SurveyCreate.php b/api/v3/examples/SurveyCreate.php
index e94ceb5fb8fc41281d0342048932fb60a6796501..1316211411e43d026e964e3021ae9d2f6facb7e1 100644
--- a/api/v3/examples/SurveyCreate.php
+++ b/api/v3/examples/SurveyCreate.php
@@ -85,4 +85,4 @@ function survey_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/SurveyDelete.php b/api/v3/examples/SurveyDelete.php
index 74a36e48935b4a86f627016f50413f532060c1a4..224d160f7032046f7e92e01ed6ad0b4f97b3c0c7 100644
--- a/api/v3/examples/SurveyDelete.php
+++ b/api/v3/examples/SurveyDelete.php
@@ -58,4 +58,4 @@ function survey_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/SurveyGet.php b/api/v3/examples/SurveyGet.php
index bbbab582a2df178e0ae77ba2460b4a2417e077ce..cf32da54b736d957a5a00b7a3925644f8d1b81cc 100644
--- a/api/v3/examples/SurveyGet.php
+++ b/api/v3/examples/SurveyGet.php
@@ -46,6 +46,7 @@ function survey_get_expectedresult(){
'is_default' => 0,
'created_date' => '2013-07-28 08:49:19',
'bypass_confirm' => 0,
+ 'is_share' => '1',
),
),
);
@@ -74,4 +75,4 @@ function survey_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/SurveyRespondantGet.php b/api/v3/examples/SurveyRespondantGet.php
index 202ada504c210c8ee89cbdd254db715b0b31ee45..0fbf52743324a84616813f2b9e520a57cb58876e 100644
--- a/api/v3/examples/SurveyRespondantGet.php
+++ b/api/v3/examples/SurveyRespondantGet.php
@@ -59,4 +59,4 @@ function survey_respondant_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/System/Flush.php b/api/v3/examples/System/Flush.php
index 497e84c14ca259c325774cf35a87424958aae39a..ecff546ee91e673112866d315f2f71ad28e91c5e 100644
--- a/api/v3/examples/System/Flush.php
+++ b/api/v3/examples/System/Flush.php
@@ -56,4 +56,4 @@ function system_flush_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/Tag/getReturnArray.php b/api/v3/examples/Tag/getReturnArray.php
index 7d115c00dfe97faa4bf663c5e8cb8b20b24c8007..73f7fe74ec8e1608292e22d6099a33e9812427b6 100644
--- a/api/v3/examples/Tag/getReturnArray.php
+++ b/api/v3/examples/Tag/getReturnArray.php
@@ -68,4 +68,4 @@ function tag_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/TagCreate.php b/api/v3/examples/TagCreate.php
index dac7b87d8dac842b0ba3794a0523866a842bdaf3..1c40802ca74013f69f2704c7df362726f5504d26 100644
--- a/api/v3/examples/TagCreate.php
+++ b/api/v3/examples/TagCreate.php
@@ -73,4 +73,4 @@ function tag_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/TagDelete.php b/api/v3/examples/TagDelete.php
index 5bc3483337d1b80aeb7cd1034930c6e589259aec..6566820ebf55d0c5b53ac58669459ecf67bf20ef 100644
--- a/api/v3/examples/TagDelete.php
+++ b/api/v3/examples/TagDelete.php
@@ -58,4 +58,4 @@ function tag_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/TagGet.php b/api/v3/examples/TagGet.php
index d828cfacdbf4590cb36b19948f337079d57a7da4..0407024bf5203eeca554d8516fea5783dee11650 100644
--- a/api/v3/examples/TagGet.php
+++ b/api/v3/examples/TagGet.php
@@ -71,4 +71,4 @@ function tag_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/TagGetfields.php b/api/v3/examples/TagGetfields.php
index a1bb2bab47bc1f35f7c68d6aedfe883bcc5c188d..119f7c8d81163838b05ccd9d645d69cc95733e0f 100644
--- a/api/v3/examples/TagGetfields.php
+++ b/api/v3/examples/TagGetfields.php
@@ -59,12 +59,13 @@ function tag_getfields_expectedresult(){
'parent_id' => array(
'name' => 'parent_id',
'type' => 1,
- 'default' => 'UL',
+ 'default' => 'NULL',
'FKClassName' => 'CRM_Core_DAO_Tag',
),
'is_selectable' => array(
'name' => 'is_selectable',
'type' => 16,
+ 'default' => '1',
),
'is_reserved' => array(
'name' => 'is_reserved',
@@ -80,7 +81,7 @@ function tag_getfields_expectedresult(){
'title' => 'Used For',
'maxlength' => 64,
'size' => 30,
- 'default' => 'UL',
+ 'default' => 'NULL',
'api.default' => 'civicrm_contact',
),
'created_id' => array(
@@ -120,4 +121,4 @@ function tag_getfields_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/UFFieldCreate.php b/api/v3/examples/UFFieldCreate.php
index 1c7350982dca11acf53c0c5e905b2dba7222b2fd..25bf14021248b54c4b16750c122dc866e2b33b97 100644
--- a/api/v3/examples/UFFieldCreate.php
+++ b/api/v3/examples/UFFieldCreate.php
@@ -89,4 +89,4 @@ function uf_field_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/UFFieldDelete.php b/api/v3/examples/UFFieldDelete.php
index 0c639a7bc8f87298c3f343c1d2ee3a5931af0993..eec876b795ed95927bde9bbc3e4f68a84acefefd 100644
--- a/api/v3/examples/UFFieldDelete.php
+++ b/api/v3/examples/UFFieldDelete.php
@@ -58,4 +58,4 @@ function uf_field_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/UFFieldGet.php b/api/v3/examples/UFFieldGet.php
index 1d9382cdd408b86d9f24d53a6b12cf1e2fc3bc45..115aae947962a0030708c8d79eefd47b921490d3 100644
--- a/api/v3/examples/UFFieldGet.php
+++ b/api/v3/examples/UFFieldGet.php
@@ -75,4 +75,4 @@ function uf_field_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/UFFieldReplace.php b/api/v3/examples/UFFieldReplace.php
index 0aef06e7db7c2a63f0a94f15cf4ed219a1022aa1..78e36c335969e6f0b217d05913fa13541ecb5ff1 100644
--- a/api/v3/examples/UFFieldReplace.php
+++ b/api/v3/examples/UFFieldReplace.php
@@ -152,4 +152,4 @@ function uf_field_replace_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/UFGroupCreate.php b/api/v3/examples/UFGroupCreate.php
index 13753b787d37bbeff45348e6943486b7ab8f4e44..4805a7dd51a28d7f411254b652c2e093a8bc2b21 100644
--- a/api/v3/examples/UFGroupCreate.php
+++ b/api/v3/examples/UFGroupCreate.php
@@ -104,4 +104,4 @@ function uf_group_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/UFGroupDelete.php b/api/v3/examples/UFGroupDelete.php
index 7ec6db9d7207ea4b2a6de0fd6c1d88f2221b61aa..a7ccd115ee5c399aaf9da36fc12abfdfde8a5aa5 100644
--- a/api/v3/examples/UFGroupDelete.php
+++ b/api/v3/examples/UFGroupDelete.php
@@ -58,4 +58,4 @@ function uf_group_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/UFGroupGet.php b/api/v3/examples/UFGroupGet.php
index b3fd004252f9c3efd6f1ab57039fde5f6c43729b..3df549ce53391b7ce7a20a7fb7a24ee00b8ffbc0 100644
--- a/api/v3/examples/UFGroupGet.php
+++ b/api/v3/examples/UFGroupGet.php
@@ -84,4 +84,4 @@ function uf_group_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/UFJoinCreate.php b/api/v3/examples/UFJoinCreate.php
index 6ac8c89213b7352715e61418da1f1d10a966c1d6..e618b2a5f2aa9cf7a5bef2bad4015c222beb619d 100644
--- a/api/v3/examples/UFJoinCreate.php
+++ b/api/v3/examples/UFJoinCreate.php
@@ -75,4 +75,4 @@ function uf_join_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/UFJoinGet.php b/api/v3/examples/UFJoinGet.php
index e8e735159531ce5461f5d1250a03ebf7c15ea69d..d51586f5558c7979095ae9151727664b9eca3550 100644
--- a/api/v3/examples/UFJoinGet.php
+++ b/api/v3/examples/UFJoinGet.php
@@ -71,4 +71,4 @@ function uf_join_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/UFMatchGet.php b/api/v3/examples/UFMatchGet.php
index 2e664f4be6b3d93da15a7fd27420d547ff6b1962..61107cdecde4fd77af0b6f2efe3352a49da282e2 100644
--- a/api/v3/examples/UFMatchGet.php
+++ b/api/v3/examples/UFMatchGet.php
@@ -66,4 +66,4 @@ function uf_match_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/WebsiteCreate.php b/api/v3/examples/WebsiteCreate.php
index 06aa440fc7476e5bb8e25ae3d5abbcb6c7e6fa64..3e9906b0ce574d543eab0e5dc6d5e5fbc2982290 100644
--- a/api/v3/examples/WebsiteCreate.php
+++ b/api/v3/examples/WebsiteCreate.php
@@ -68,4 +68,4 @@ function website_create_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/WebsiteDelete.php b/api/v3/examples/WebsiteDelete.php
index 254b6a233d50ffd1349b907e057594270bb63c8e..d8c254168b94537903032791de85f437318b88ad 100644
--- a/api/v3/examples/WebsiteDelete.php
+++ b/api/v3/examples/WebsiteDelete.php
@@ -58,4 +58,4 @@ function website_delete_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/api/v3/examples/WebsiteGet.php b/api/v3/examples/WebsiteGet.php
index 914c0c67a19f752bceb43048a5e950d5f78091c4..91e4050fefca0da3bddb17ee0928a8c8553b7b8a 100644
--- a/api/v3/examples/WebsiteGet.php
+++ b/api/v3/examples/WebsiteGet.php
@@ -68,4 +68,4 @@ function website_get_expectedresult(){
*
* API Standards documentation:
* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
\ No newline at end of file
+*/
diff --git a/js/crm.backbone.js b/js/crm.backbone.js
index 87c1c5cbc3f0aa0df8e8ce680c570aa72e0522ea..647d70c735a9a9aa635d7102fd9bda03e3825329 100644
--- a/js/crm.backbone.js
+++ b/js/crm.backbone.js
@@ -32,14 +32,14 @@
};
switch (method) {
case 'read':
- CRM.api(model.crmEntityName, 'get', model.toCrmCriteria(), apiOptions);
+ CRM.api(model.crmEntityName, model.toCrmAction('get'), model.toCrmCriteria(), apiOptions);
break;
// replace all entities matching "x.crmCriteria" with new entities in "x.models"
case 'crm-replace':
var params = this.toCrmCriteria();
params.version = 3;
params.values = this.toJSON();
- CRM.api(model.crmEntityName, 'replace', params, apiOptions);
+ CRM.api(model.crmEntityName, model.toCrmAction('replace'), params, apiOptions);
break;
default:
apiOptions.error({is_error: 1, error_message: "CRM.Backbone.sync(" + method + ") not implemented for collections"});
@@ -74,9 +74,9 @@
params.options || (params.options = {});
params.options.reload = 1;
if (!model._isDuplicate) {
- CRM.api(model.crmEntityName, 'create', params, apiOptions);
+ CRM.api(model.crmEntityName, model.toCrmAction('create'), params, apiOptions);
} else {
- CRM.api(model.crmEntityName, 'duplicate', params, apiOptions);
+ CRM.api(model.crmEntityName, model.toCrmAction('duplicate'), params, apiOptions);
}
break;
case 'read':
@@ -87,7 +87,7 @@
apiOptions.error({is_error: 1, error_message: 'Missing ID for ' + model.crmEntityName});
return;
}
- CRM.api(model.crmEntityName, apiAction, params, apiOptions);
+ CRM.api(model.crmEntityName, model.toCrmAction(apiAction), params, apiOptions);
break;
default:
apiOptions.error({is_error: 1, error_message: "CRM.Backbone.sync(" + method + ") not implemented for models"});
@@ -116,6 +116,10 @@
// Defaults - if specified in ModelClass, preserve
_.defaults(ModelClass.prototype, {
crmEntityName: crmEntityName,
+ crmActions: {}, // map: string backboneActionName => string serverSideActionName
+ toCrmAction: function(action) {
+ return this.crmActions[action] ? this.crmActions[action] : action;
+ },
toCrmCriteria: function() {
return (this.get('id')) ? {id: this.get('id')} : {};
},
@@ -308,6 +312,10 @@
// Defaults - if specified in CollectionClass, preserve
_.defaults(CollectionClass.prototype, {
crmEntityName: CollectionClass.prototype.model.prototype.crmEntityName,
+ crmActions: {}, // map: string backboneActionName => string serverSideActionName
+ toCrmAction: function(action) {
+ return this.crmActions[action] ? this.crmActions[action] : action;
+ },
toCrmCriteria: function() {
return (this.crmCriteria) ? _.extend({}, this.crmCriteria) : {};
},
@@ -330,7 +338,7 @@
debouncedFetch: _.debounce(function() {
this.fetch({reset: true});
- }, 500),
+ }, 100),
/**
* Reconcile the server's collection with the client's collection.
@@ -365,6 +373,9 @@
} else if (options.crmCriteria) {
this.crmCriteria = options.crmCriteria;
}
+ if (options.crmActions) {
+ this.crmActions = _.extend(this.crmActions, options.crmActions);
+ }
if (origInit) {
return origInit.apply(this, arguments);
}
diff --git a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
index 2169552b6ce5fd47fb8eb1b7f1b4c4c0b73d7bb6..617753d5ddda3e1ad831de7e1b83b8804c068c2a 100644
--- a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
+++ b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
@@ -469,6 +469,13 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase {
$dao = new CRM_Core_DAO();
$contribution_page = $dao->createTestObject('CRM_Contribute_DAO_ContributionPage');
$contribution->contribution_page_id = $contributionPageID = $contribution_page->id;
+ //for unknown reasons trying to do a find & save on a contribution with a receive_date set
+ // doesn't work. This seems of minimal relevance to this test so ignoring
+ // note that in tests it worked sometimes & not others - dependent on which other tests run.
+ // running all CRM_Core tests caused failure as did just the single failing test. But running
+ // just this class succeeds - because it actually doesn't do a mysql update on the following save
+ // (unknown reason)
+ unset($contribution->receive_date);
$contribution->save();
}
diff --git a/tests/phpunit/CRM/Utils/ArrayTest.php b/tests/phpunit/CRM/Utils/ArrayTest.php
index 8b2509f2fa6d4cc4e2b79df74c70e49f1a722d38..2d31965abc658b9f0374969b2294ae4972d33f6a 100644
--- a/tests/phpunit/CRM/Utils/ArrayTest.php
+++ b/tests/phpunit/CRM/Utils/ArrayTest.php
@@ -33,7 +33,7 @@ class CRM_Utils_ArrayTest extends CiviUnitTestCase {
$inputs[] = array(
'lang' => 'en',
'msgid' => 'greeting',
- 'familiar' => false,
+ 'familiar' => FALSE,
'value' => 'Hello'
);
$inputs[] = array(
@@ -54,7 +54,7 @@ class CRM_Utils_ArrayTest extends CiviUnitTestCase {
$inputs[] = array(
'lang' => 'en',
'msgid' => 'greeting',
- 'familiar' => true,
+ 'familiar' => TRUE,
'value' => 'Hey'
);
@@ -82,4 +82,41 @@ class CRM_Utils_ArrayTest extends CiviUnitTestCase {
$this->assertEquals($expected, CRM_Utils_Array::collect('catWord', $arr));
}
+ function testProduct0() {
+ $actual = CRM_Utils_Array::product(
+ array(),
+ array('base data' => 1)
+ );
+ $this->assertEquals(array(
+ array('base data' => 1),
+ ), $actual);
+ }
+
+ function testProduct1() {
+ $actual = CRM_Utils_Array::product(
+ array('dim1' => array('a', 'b')),
+ array('base data' => 1)
+ );
+ $this->assertEquals(array(
+ array('base data' => 1, 'dim1' => 'a'),
+ array('base data' => 1, 'dim1' => 'b'),
+ ), $actual);
+ }
+
+ function testProduct3() {
+ $actual = CRM_Utils_Array::product(
+ array('dim1' => array('a', 'b'), 'dim2' => array('alpha', 'beta'), 'dim3' => array('one', 'two')),
+ array('base data' => 1)
+ );
+ $this->assertEquals(array(
+ array('base data' => 1, 'dim1' => 'a', 'dim2' => 'alpha', 'dim3' => 'one'),
+ array('base data' => 1, 'dim1' => 'a', 'dim2' => 'alpha', 'dim3' => 'two'),
+ array('base data' => 1, 'dim1' => 'a', 'dim2' => 'beta', 'dim3' => 'one'),
+ array('base data' => 1, 'dim1' => 'a', 'dim2' => 'beta', 'dim3' => 'two'),
+ array('base data' => 1, 'dim1' => 'b', 'dim2' => 'alpha', 'dim3' => 'one'),
+ array('base data' => 1, 'dim1' => 'b', 'dim2' => 'alpha', 'dim3' => 'two'),
+ array('base data' => 1, 'dim1' => 'b', 'dim2' => 'beta', 'dim3' => 'one'),
+ array('base data' => 1, 'dim1' => 'b', 'dim2' => 'beta', 'dim3' => 'two'),
+ ), $actual);
+ }
}
diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php
index bd819a5731652fb27632113a67bba9269d113a65..8627e23fede610e9022d11ad172285f2f03a5f15 100644
--- a/tests/phpunit/api/v3/ContactTest.php
+++ b/tests/phpunit/api/v3/ContactTest.php
@@ -578,11 +578,23 @@ class api_v3_ContactTest extends CiviUnitTestCase {
$params = array('return' => 'custom_' . $ids['custom_field_id'], 'id' => $result['id']);
$check = $this->callAPIAndDocument($this->_entity, 'get', $params, __FUNCTION__, __FILE__, $description, $subfile);
- $this->assertEquals("custom string", $check['values'][$check['id']]['custom_' . $ids['custom_field_id']], ' in line ' . __LINE__);
+ $this->assertEquals("custom string", $check['values'][$check['id']]['custom_' . $ids['custom_field_id']]);
$this->customFieldDelete($ids['custom_field_id']);
$this->customGroupDelete($ids['custom_group_id']);
}
+ /**
+ * Check that address name is returned if required
+ */
+ function testGetReturnAddressName () {
+ $contactID = $this->individualCreate();
+ $this->callAPISuccess('address', 'create', array('contact_id' => $contactID, 'address_name' => 'My house', 'location_type_id' => 'Home', 'street_address' => '1 my road'));
+ $result = $this->callAPISuccessGetSingle('contact', array('return' => 'address_name, street_address', 'id' => $contactID));
+ $this->assertEquals('1 my road', $result['street_address']);
+ $this->assertEquals('My house', $result['address_name']);
+
+ }
+
function testGetGroupIDFromContact() {
$groupId = $this->groupCreate(NULL);
$description = "Get all from group and display contacts";
@@ -883,7 +895,7 @@ class api_v3_ContactTest extends CiviUnitTestCase {
'home_url' => 'http://www.example.org',
);
- $getResult = $this->callAPISuccess('Contact', 'Get', array());
+
$result = $this->callAPISuccess('Contact', 'Update', $params);
$getResult = $this->callAPISuccess('Contact', 'Get', $params);
unset($params['contact_id']);
@@ -958,15 +970,14 @@ class api_v3_ContactTest extends CiviUnitTestCase {
$result = $this->callAPISuccess('Contact', 'Update', $params);
- // Check updated civicrm_contact against expected
- $expected = new PHPUnit_Extensions_Database_DataSet_XMLDataSet(
- dirname(__FILE__) . '/dataset/contact_hld_upd.xml'
- );
- $actual = new PHPUnit_Extensions_Database_DataSet_QueryDataset(
- $this->_dbconn
+ $expected = array(
+ 'contact_type' => 'Household',
+ 'is_opt_out' => 0,
+ 'sort_name' => 'ABC household',
+ 'display_name' => 'ABC household',
+ 'nick_name' => 'ABC House',
);
- $actual->addTable('civicrm_contact');
- $expected->matches($actual);
+ $this->getAndCheck($expected, $result['id'], 'contact');
}
/**
@@ -1086,20 +1097,14 @@ class api_v3_ContactTest extends CiviUnitTestCase {
* Test civicrm_contact_get() with default return properties
*/
public function testContactGetRetDefault() {
- // Insert a row in civicrm_contact creating contact 17
- $op = new PHPUnit_Extensions_Database_Operation_Insert();
- $op->execute($this->_dbconn,
- new PHPUnit_Extensions_Database_DataSet_XMLDataSet(
- dirname(__FILE__) . '/dataset/contact_17.xml'
- )
- );
+ $contactID = $this->individualCreate();
$params = array(
- 'contact_id' => 17,
+ 'contact_id' => $contactID,
'sort' => 'first_name',
);
$result = $this->callAPISuccess('contact', 'get', $params);
- $this->assertEquals(17, $result['values'][17]['contact_id'], "In line " . __LINE__);
- $this->assertEquals('Test', $result['values'][17]['first_name'], "In line " . __LINE__);
+ $this->assertEquals($contactID, $result['values'][$contactID]['contact_id']);
+ $this->assertEquals('Anthony', $result['values'][$contactID]['first_name']);
}
/**
diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index 6e557393132f3c16a3cfa395a69885c5b36860c5..c05465c93185a85f1faa8af2d6571371c0c9a119 100644
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -513,6 +513,20 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
$this->assertEquals($contribution['values'][$contribution['id']]['total_amount'], 100.00, 'In line ' . __LINE__);
$this->assertEquals($contribution['values'][$contribution['id']]['source'], 'SSF', 'In line ' . __LINE__);
}
+
+ /*
+ * Create test with unique field name on source
+ */
+ function testCreateDefaultNow() {
+
+ $params = $this->_params;
+ unset($params['receive_date']);
+
+ $contribution = $this->callAPISuccess('contribution', 'create', $params);
+ $contribution = $this->callAPISuccessGetSingle('contribution', array('id' => $contribution['id']));
+ $this->assertEquals(date('Y-m-d'), date('Y-m-d', strtotime($contribution['receive_date'])));
+ }
+
/*
* Create test with unique field name on source
*/