From 86bb6edf7e9bd04608499b239d31e27b9ca420e9 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 7 Apr 2023 11:52:51 +1200 Subject: [PATCH] Remove references to preferred_mail_format from examples Just reduces confusion / grep results. Technically it still is returned at this stage but these examples are kinda static now --- Civi/Test/ExampleData/Contact/Barb.php | 1 - .../Activity/ReturnAssigneeContact.ex.php | 1 - .../examples/Contact/APIChainedArray.ex.php | 1 - .../Contact/APIChainedArrayFormats.ex.php | 1 - .../APIChainedArrayMultipleCustom.ex.php | 1 - ...ainedArrayValuesFromSiblingFunction.ex.php | 1 - .../examples/Contact/ChainTwoWebsites.ex.php | 1 - .../Contact/ChainTwoWebsitesSyntax2.ex.php | 1 - .../ContactIDOfLoggedInUserContactAPI.ex.php | 1 - api/v3/examples/Contact/Create.ex.php | 1 - .../Contact/CreateParticipantPayment.ex.php | 1 - api/v3/examples/Contact/Get.ex.php | 1 - .../examples/Contact/GetFieldsOptions.ex.php | 28 ------------------- .../examples/Contact/GetSingleContact.ex.php | 1 - .../Contact/GroupFilterUsingContactAPI.ex.php | 1 - .../Contact/NestedReplaceEmail.ex.php | 1 - api/v3/examples/Mailing/GetTokens.ex.php | 1 - api/v3/examples/Profile/Submit.ex.php | 1 - 18 files changed, 45 deletions(-) diff --git a/Civi/Test/ExampleData/Contact/Barb.php b/Civi/Test/ExampleData/Contact/Barb.php index 6127f89700..3bbcdf99f8 100644 --- a/Civi/Test/ExampleData/Contact/Barb.php +++ b/Civi/Test/ExampleData/Contact/Barb.php @@ -32,7 +32,6 @@ class Barb extends EntityExample { 'image_URL' => NULL, 'preferred_communication_method' => NULL, 'preferred_language' => NULL, - 'preferred_mail_format' => 'Both', 'first_name' => 'Barbara', 'middle_name' => '', 'last_name' => 'Johnson', diff --git a/api/v3/examples/Activity/ReturnAssigneeContact.ex.php b/api/v3/examples/Activity/ReturnAssigneeContact.ex.php index 56eafffd28..8fa66eb2b5 100644 --- a/api/v3/examples/Activity/ReturnAssigneeContact.ex.php +++ b/api/v3/examples/Activity/ReturnAssigneeContact.ex.php @@ -100,7 +100,6 @@ function activity_get_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'first_name' => 'Anthony', 'middle_name' => 'J.', 'last_name' => 'Anderson', diff --git a/api/v3/examples/Contact/APIChainedArray.ex.php b/api/v3/examples/Contact/APIChainedArray.ex.php index 9b27a5e7ac..26085a0a4f 100644 --- a/api/v3/examples/Contact/APIChainedArray.ex.php +++ b/api/v3/examples/Contact/APIChainedArray.ex.php @@ -76,7 +76,6 @@ function contact_get_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'first_name' => 'abc3', 'middle_name' => '', 'last_name' => 'xyz3', diff --git a/api/v3/examples/Contact/APIChainedArrayFormats.ex.php b/api/v3/examples/Contact/APIChainedArrayFormats.ex.php index 5e915fa949..1372a9a0c6 100644 --- a/api/v3/examples/Contact/APIChainedArrayFormats.ex.php +++ b/api/v3/examples/Contact/APIChainedArrayFormats.ex.php @@ -77,7 +77,6 @@ function contact_get_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'first_name' => 'abc3', 'middle_name' => '', 'last_name' => 'xyz3', diff --git a/api/v3/examples/Contact/APIChainedArrayMultipleCustom.ex.php b/api/v3/examples/Contact/APIChainedArrayMultipleCustom.ex.php index f721e50ebe..f99ba59e90 100644 --- a/api/v3/examples/Contact/APIChainedArrayMultipleCustom.ex.php +++ b/api/v3/examples/Contact/APIChainedArrayMultipleCustom.ex.php @@ -74,7 +74,6 @@ function contact_get_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'first_name' => 'abc3', 'middle_name' => '', 'last_name' => 'xyz3', diff --git a/api/v3/examples/Contact/APIChainedArrayValuesFromSiblingFunction.ex.php b/api/v3/examples/Contact/APIChainedArrayValuesFromSiblingFunction.ex.php index 93ba35e529..5fb2e587e5 100644 --- a/api/v3/examples/Contact/APIChainedArrayValuesFromSiblingFunction.ex.php +++ b/api/v3/examples/Contact/APIChainedArrayValuesFromSiblingFunction.ex.php @@ -79,7 +79,6 @@ function contact_create_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'hash' => '67eac7789eaee00', 'api_key' => '', 'first_name' => '', diff --git a/api/v3/examples/Contact/ChainTwoWebsites.ex.php b/api/v3/examples/Contact/ChainTwoWebsites.ex.php index 5901d1198f..5e81a2ed56 100644 --- a/api/v3/examples/Contact/ChainTwoWebsites.ex.php +++ b/api/v3/examples/Contact/ChainTwoWebsites.ex.php @@ -92,7 +92,6 @@ function contact_create_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'hash' => '67eac7789eaee00', 'api_key' => '', 'first_name' => 'abc3', diff --git a/api/v3/examples/Contact/ChainTwoWebsitesSyntax2.ex.php b/api/v3/examples/Contact/ChainTwoWebsitesSyntax2.ex.php index fd4fc0240c..09812436aa 100644 --- a/api/v3/examples/Contact/ChainTwoWebsitesSyntax2.ex.php +++ b/api/v3/examples/Contact/ChainTwoWebsitesSyntax2.ex.php @@ -95,7 +95,6 @@ function contact_create_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'hash' => '67eac7789eaee00', 'api_key' => '', 'first_name' => 'abc3', diff --git a/api/v3/examples/Contact/ContactIDOfLoggedInUserContactAPI.ex.php b/api/v3/examples/Contact/ContactIDOfLoggedInUserContactAPI.ex.php index 57ef407cec..9f7c7c21b6 100644 --- a/api/v3/examples/Contact/ContactIDOfLoggedInUserContactAPI.ex.php +++ b/api/v3/examples/Contact/ContactIDOfLoggedInUserContactAPI.ex.php @@ -69,7 +69,6 @@ function contact_get_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'first_name' => 'Logged In', 'middle_name' => 'J.', 'last_name' => 'User 707727958', diff --git a/api/v3/examples/Contact/Create.ex.php b/api/v3/examples/Contact/Create.ex.php index 7ed05c88a3..d8a5f6478d 100644 --- a/api/v3/examples/Contact/Create.ex.php +++ b/api/v3/examples/Contact/Create.ex.php @@ -72,7 +72,6 @@ function contact_create_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'hash' => '67eac7789eaee00', 'api_key' => '', 'first_name' => 'abc1', diff --git a/api/v3/examples/Contact/CreateParticipantPayment.ex.php b/api/v3/examples/Contact/CreateParticipantPayment.ex.php index ccde534e69..307a4d1903 100644 --- a/api/v3/examples/Contact/CreateParticipantPayment.ex.php +++ b/api/v3/examples/Contact/CreateParticipantPayment.ex.php @@ -86,7 +86,6 @@ function contact_create_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'hash' => '67eac7789eaee00', 'api_key' => '', 'first_name' => '', diff --git a/api/v3/examples/Contact/Get.ex.php b/api/v3/examples/Contact/Get.ex.php index 5ec0091920..168d15d1c6 100644 --- a/api/v3/examples/Contact/Get.ex.php +++ b/api/v3/examples/Contact/Get.ex.php @@ -67,7 +67,6 @@ function contact_get_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'first_name' => '', 'middle_name' => '', 'last_name' => '', diff --git a/api/v3/examples/Contact/GetFieldsOptions.ex.php b/api/v3/examples/Contact/GetFieldsOptions.ex.php index 04a81a4123..cf984e1d4e 100644 --- a/api/v3/examples/Contact/GetFieldsOptions.ex.php +++ b/api/v3/examples/Contact/GetFieldsOptions.ex.php @@ -479,34 +479,6 @@ function contact_getfields_expectedresult() { 'add' => '3.2', 'is_core_field' => TRUE, ], - 'preferred_mail_format' => [ - 'name' => 'preferred_mail_format', - 'type' => 2, - 'title' => 'Preferred Mail Format', - 'description' => 'What is the preferred mode of sending an email.', - 'maxlength' => 8, - 'size' => 8, - 'import' => TRUE, - 'where' => 'civicrm_contact.preferred_mail_format', - 'headerPattern' => '/^p(ref\\w*\\s)?m(ail\\s)?f(orm\\w*)$/i', - 'export' => TRUE, - 'default' => 'Both', - 'table_name' => 'civicrm_contact', - 'entity' => 'Contact', - 'bao' => 'CRM_Contact_BAO_Contact', - 'localizable' => 0, - 'html' => [ - 'type' => 'Select', - 'label' => 'Preferred Mail Format', - 'maxlength' => 8, - 'size' => 8, - ], - 'pseudoconstant' => [ - 'callback' => 'CRM_Core_SelectValues::pmf', - ], - 'add' => '1.1', - 'is_core_field' => TRUE, - ], 'hash' => [ 'name' => 'hash', 'type' => 2, diff --git a/api/v3/examples/Contact/GetSingleContact.ex.php b/api/v3/examples/Contact/GetSingleContact.ex.php index 12d9061f80..1590daf0c9 100644 --- a/api/v3/examples/Contact/GetSingleContact.ex.php +++ b/api/v3/examples/Contact/GetSingleContact.ex.php @@ -65,7 +65,6 @@ function contact_getsingle_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'first_name' => 'Test', 'middle_name' => 'J.', 'last_name' => 'Contact', diff --git a/api/v3/examples/Contact/GroupFilterUsingContactAPI.ex.php b/api/v3/examples/Contact/GroupFilterUsingContactAPI.ex.php index 24a4154202..aa05306ece 100644 --- a/api/v3/examples/Contact/GroupFilterUsingContactAPI.ex.php +++ b/api/v3/examples/Contact/GroupFilterUsingContactAPI.ex.php @@ -74,7 +74,6 @@ function contact_get_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'first_name' => 'Test2', 'middle_name' => '', 'last_name' => 'Group member', diff --git a/api/v3/examples/Contact/NestedReplaceEmail.ex.php b/api/v3/examples/Contact/NestedReplaceEmail.ex.php index 07c65f86ba..9da1b89f06 100644 --- a/api/v3/examples/Contact/NestedReplaceEmail.ex.php +++ b/api/v3/examples/Contact/NestedReplaceEmail.ex.php @@ -98,7 +98,6 @@ function contact_get_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'first_name' => '', 'middle_name' => '', 'last_name' => '', diff --git a/api/v3/examples/Mailing/GetTokens.ex.php b/api/v3/examples/Mailing/GetTokens.ex.php index 5b39bb7dd5..416b3ac86d 100644 --- a/api/v3/examples/Mailing/GetTokens.ex.php +++ b/api/v3/examples/Mailing/GetTokens.ex.php @@ -93,7 +93,6 @@ function mailing_gettokens_expectedresult() { '{contact.image_URL}' => 'Image Url', '{contact.preferred_communication_method:label}' => 'Preferred Communication Method', '{contact.preferred_language:label}' => 'Preferred Language', - '{contact.preferred_mail_format:label}' => 'Preferred Mail Format', '{contact.hash}' => 'Contact Hash', '{contact.source}' => 'Contact Source', '{contact.first_name}' => 'First Name', diff --git a/api/v3/examples/Profile/Submit.ex.php b/api/v3/examples/Profile/Submit.ex.php index 451dc557f9..571118dfde 100644 --- a/api/v3/examples/Profile/Submit.ex.php +++ b/api/v3/examples/Profile/Submit.ex.php @@ -74,7 +74,6 @@ function profile_submit_expectedresult() { 'image_URL' => '', 'preferred_communication_method' => '', 'preferred_language' => 'en_US', - 'preferred_mail_format' => 'Both', 'hash' => '67eac7789eaee00', 'api_key' => '', 'first_name' => 'abc2', -- 2.25.1