Merge pull request #10119 from eileenmcnaughton/deprecated

Add deprecation comments, CRM-19987
civicrm · Apr 6, 2017 · 4e48646 · 4e48646
2 parents f71e9ef + a59cecb
commit 4e48646
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
@@ -1458,6 +1458,8 @@ public static function &importableFields($status = FALSE) {
   }
 
   /**
+   * @deprecated - use the api instead.
+   *
    * Get the Activities of a target contact.
    *
    * @param int $contactId
@@ -1467,6 +1469,7 @@ public static function &importableFields($status = FALSE) {
    *   array of activity fields
    */
   public static function getContactActivity($contactId) {
+    // @todo remove this function entirely.
     $activities = array();
     $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name');
     $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);

diff --git a/CRM/Contact/Form/Task/SMSCommon.php b/CRM/Contact/Form/Task/SMSCommon.php
@@ -198,6 +198,7 @@ public static function buildQuickForm(&$form) {
 
         if (CRM_Utils_System::getClassName($form) == 'CRM_Activity_Form_Task_SMS') {
           //to check for "if the contact id belongs to a specified activity type"
+          // @todo use the api instead - function is deprecated.
           $actDetails = CRM_Activity_BAO_Activity::getContactActivity($contactId);
           if (self::RECIEVED_SMS_ACTIVITY_SUBJECT !=
             CRM_Utils_Array::retrieveValueRecursive($actDetails, 'subject')

diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -81,6 +81,7 @@ public function testGetContactActivity() {
       'subject', 'Database check for created activity.'
     );
 
+    // @todo - remove this deprecated functions
     $activities = CRM_Activity_BAO_Activity::getContactActivity($targetContactId);
 
     $this->assertEquals($activities[$activityId]['subject'], 'Scheduling Meeting', 'Verify activity subject is correct.');