Refactor individual prefix and suffix CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index f0777d4168cb9c10177f8164fe4e481e68b2a12e..ebd47655d09e8f97044d3bd173b1997ca2538428 100644 (file)
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -518,8 +518,8 @@ WHERE     civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer');
       }
     }
 
-    CRM_Utils_Array::lookupValue($defaults, 'prefix', CRM_Core_PseudoConstant::individualPrefix(), $reverse);
-    CRM_Utils_Array::lookupValue($defaults, 'suffix', CRM_Core_PseudoConstant::individualSuffix(), $reverse);
+    CRM_Utils_Array::lookupValue($defaults, 'prefix', CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id'), $reverse);
+    CRM_Utils_Array::lookupValue($defaults, 'suffix', CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id'), $reverse);
     CRM_Utils_Array::lookupValue($defaults, 'gender', CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id'), $reverse);
 
     //lookup value of email/postal greeting, addressee, CRM-4575

diff --git a/CRM/Contact/BAO/Contact/Utils.php b/CRM/Contact/BAO/Contact/Utils.php
index 26b03dc2b207e8a5e8c909ef99fae70c61746c21..b36f571b6cf613f09274f420e5895ca3437289e3 100644 (file)
--- a/CRM/Contact/BAO/Contact/Utils.php
+++ b/CRM/Contact/BAO/Contact/Utils.php
@@ -526,7 +526,7 @@ WHERE id={$contactId}; ";
       default:
         // individual
         $form->addElement('select', 'prefix_id', ts('Prefix'),
-          array('' => ts('- prefix -')) + CRM_Core_PseudoConstant::individualPrefix()
+          array('' => ts('- prefix -')) + CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id')
         );
         $form->addElement('text', 'first_name', ts('First Name'),
           $attributes['first_name']
@@ -538,7 +538,7 @@ WHERE id={$contactId}; ";
           $attributes['last_name']
         );
         $form->addElement('select', 'suffix_id', ts('Suffix'),
-          array('' => ts('- suffix -')) + CRM_Core_PseudoConstant::individualSuffix()
+          array('' => ts('- suffix -')) + CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id')
         );
     }
 

diff --git a/CRM/Contact/BAO/Individual.php b/CRM/Contact/BAO/Individual.php
index fa24c3b1ce2a64bc8b26dd58ac2610f6febff0ae..e92727332a44458fa042f6b6915c65bb313214f4 100644 (file)
--- a/CRM/Contact/BAO/Individual.php
+++ b/CRM/Contact/BAO/Individual.php
@@ -76,8 +76,8 @@ class CRM_Contact_BAO_Individual extends CRM_Contact_DAO_Contact {
     $suffix_id  = CRM_Utils_Array::value('suffix_id', $params, '');
 
     // get prefix and suffix names
-    $prefixes = CRM_Core_PseudoConstant::individualPrefix();
-    $suffixes = CRM_Core_PseudoConstant::individualSuffix();
+    $prefixes = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
+    $suffixes = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id');
 
     $prefix = $suffix = NULL;
     if ($prefix_id) {
@@ -383,8 +383,8 @@ class CRM_Contact_BAO_Individual extends CRM_Contact_DAO_Contact {
    * @return string  the constructed display name
    */
   function displayName() {
-    $prefix = CRM_Core_PseudoConstant::individualPrefix();
-    $suffix = CRM_Core_PseudoConstant::individualSuffix();
+    $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
+    $suffix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id');
     return str_replace('  ', ' ', trim($prefix[$this->prefix_id] . ' ' . $this->first_name . ' ' . $this->middle_name . ' ' . $this->last_name . ' ' . $suffix[$this->suffix_id]));
   }
 

diff --git a/CRM/Contact/Form/Edit/Individual.php b/CRM/Contact/Form/Edit/Individual.php
index 975c8bdae96a1252569fb3e224847e3ff8cbf96a..369c3268bf7857a22aadff282bbffee20a08ae56 100644 (file)
--- a/CRM/Contact/Form/Edit/Individual.php
+++ b/CRM/Contact/Form/Edit/Individual.php
@@ -56,7 +56,7 @@ class CRM_Contact_Form_Edit_Individual {
 
     if ( !$inlineEditMode || $inlineEditMode == 1 ) {
       //prefix
-      $prefix = CRM_Core_PseudoConstant::individualPrefix();
+      $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
       if (!empty($prefix)) {
         $form->addElement('select', 'prefix_id', ts('Prefix'), array('' => '') + $prefix);
       }
@@ -73,7 +73,7 @@ class CRM_Contact_Form_Edit_Individual {
       $form->addElement('text', 'last_name', ts('Last Name'), $attributes['last_name']);
 
       // suffix
-      $suffix = CRM_Core_PseudoConstant::individualSuffix();
+      $suffix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id');
       if ($suffix) {
         $form->addElement('select', 'suffix_id', ts('Suffix'), array('' => '') + $suffix);
       }

diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
index 107665015ebaaf17088f7eb38ba7351a8c7a2f9c..608c3426e1cbd0502cc5f782b5c8ba3699193fb4 100644 (file)
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -1386,13 +1386,13 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser {
             break;
 
           case 'individual_prefix':
-            if (!self::in_value($value, CRM_Core_PseudoConstant::individualPrefix())) {
+            if (!self::in_value($value, CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id'))) {
               self::addToErrorMsg(ts('Individual Prefix'), $errorMessage);
             }
             break;
 
           case 'individual_suffix':
-            if (!self::in_value($value, CRM_Core_PseudoConstant::individualSuffix())) {
+            if (!self::in_value($value, CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id'))) {
               self::addToErrorMsg(ts('Individual Suffix'), $errorMessage);
             }
             break;

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 607907abb417438a22de07e3d6fc1b1768ab17f1..0103ce58d6b9ef851e62ceb5a744571755aaf496 100644 (file)
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -2259,7 +2259,7 @@ WHERE  contribution_id = %1 ";
 
       $template->assign('honor_block_is_active', 1);
       if (CRM_Utils_Array::value('prefix_id', $honorDefault)) {
-        $prefix = CRM_Core_PseudoConstant::individualPrefix();
+        $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
         $template->assign('honor_prefix', $prefix[$honorDefault['prefix_id']]);
       }
       $template->assign('honor_first_name', CRM_Utils_Array::value('first_name', $honorDefault));

diff --git a/CRM/Contribute/Form/AdditionalInfo.php b/CRM/Contribute/Form/AdditionalInfo.php
index 449267f6216faeaa57e13e412d385b4fd00a76cf..af123b1e1c17c8498e0cdcfbac8b94ade780845b 100644 (file)
--- a/CRM/Contribute/Form/AdditionalInfo.php
+++ b/CRM/Contribute/Form/AdditionalInfo.php
@@ -170,7 +170,7 @@ class CRM_Contribute_Form_AdditionalInfo {
       $honorTypes[$key] = $form->createElement('radio', NULL, NULL, $var, $key, $extraOption);
     }
     $form->addGroup($honorTypes, 'honor_type_id', NULL);
-    $form->add('select', 'honor_prefix_id', ts('Prefix'), array('' => ts('- prefix -')) + CRM_Core_PseudoConstant::individualPrefix());
+    $form->add('select', 'honor_prefix_id', ts('Prefix'), array('' => ts('- prefix -')) + CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id'));
     $form->add('text', 'honor_first_name', ts('First Name'));
     $form->add('text', 'honor_last_name', ts('Last Name'));
     $form->add('text', 'honor_email', ts('Email'));
@@ -362,7 +362,7 @@ class CRM_Contribute_Form_AdditionalInfo {
 
     // retrieve individual prefix value for honoree
     if (CRM_Utils_Array::value('hidden_Honoree', $params)) {
-      $individualPrefix = CRM_Core_PseudoConstant::individualPrefix();
+      $individualPrefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
       $honor = CRM_Core_PseudoConstant::honor();
       $params['honor_prefix'] = CRM_Utils_Array::value(CRM_Utils_Array::value('honor_prefix_id',
           $params

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 3f74ddaa12235451c0d1e3049b93e12357218cce..19e83fc3566c7c9f22bdfcacd77e36131c6da74e 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -387,7 +387,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
       $this->assign('honor_block_is_active', $honor_block_is_active);
       $this->assign('honor_block_title', CRM_Utils_Array::value('honor_block_title', $this->_values));
 
-      $prefix = CRM_Core_PseudoConstant::individualPrefix();
+      $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
       $honor = CRM_Core_PseudoConstant::honor();
       $this->assign('honor_type', CRM_Utils_Array::value($params['honor_type_id'], $honor));
       $this->assign('honor_prefix', CRM_Utils_Array::value($params['honor_prefix_id'], $prefix));
@@ -1572,7 +1572,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
     $this->assign('honor_block_is_active', $honor_block_is_active);
     $this->assign('honor_block_title', CRM_Utils_Array::value('honor_block_title', $this->_values));
 
-    $prefix = CRM_Core_PseudoConstant::individualPrefix();
+    $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
     $honorType = CRM_Core_PseudoConstant::honor();
     $this->assign('honor_type', CRM_Utils_Array::value(CRM_Utils_Array::value('honor_type_id', $params), $honorType));
     $this->assign('honor_prefix', CRM_Utils_Array::value(CRM_Utils_Array::value('honor_prefix_id', $params), $prefix));

diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
index 8112cda30ef38b1deca8c9a8c7874e823461096d..83a293fe1997a7951c635a175d39b7fd119314f7 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Main.php
+++ b/CRM/Contribute/Form/Contribution/Main.php
@@ -606,7 +606,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
     $this->addGroup($honorTypes, 'honor_type_id', NULL);
 
     // prefix
-    $this->addElement('select', 'honor_prefix_id', ts('Prefix'), array('' => ts('- prefix -')) + CRM_Core_PseudoConstant::individualPrefix());
+    $this->addElement('select', 'honor_prefix_id', ts('Prefix'), array('' => ts('- prefix -')) + CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id'));
     // first_name
     $this->addElement('text', 'honor_first_name', ts('First Name'), $attributes['first_name']);
 

diff --git a/CRM/Contribute/Form/Contribution/ThankYou.php b/CRM/Contribute/Form/Contribution/ThankYou.php
index 525b929d8d1f22880c82924b837095d25a74f2f5..392d065f7abcff7ac8bc22622a0d0e0036a71b94 100644 (file)
--- a/CRM/Contribute/Form/Contribution/ThankYou.php
+++ b/CRM/Contribute/Form/Contribution/ThankYou.php
@@ -128,7 +128,7 @@ class CRM_Contribute_Form_Contribution_ThankYou extends CRM_Contribute_Form_Cont
       $this->assign('honor_block_is_active', $honor_block_is_active);
       $this->assign('honor_block_title', CRM_Utils_Array::value('honor_block_title', $this->_values));
 
-      $prefix = CRM_Core_PseudoConstant::individualPrefix();
+      $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
       $honor = CRM_Core_PseudoConstant::honor();
       $this->assign('honor_type', $honor[$params["honor_type_id"]]);
       $this->assign('honor_prefix', ($params["honor_prefix_id"]) ? $prefix[$params["honor_prefix_id"]] : ' ');

diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php
index 8029cc6c3b7941f1854daeb0321073ba88d67ce7..3c2e751510cdbc50515fcf3d5b2098280dabf3b5 100644 (file)
--- a/CRM/Core/BAO/UFGroup.php
+++ b/CRM/Core/BAO/UFGroup.php
@@ -1843,13 +1843,13 @@ AND    ( entity_id IS NULL OR entity_id <= 0 )
     elseif ($fieldName === 'individual_prefix') {
       $form->add('select', $name, $title,
         array(
-          '' => ts('- select -')) + CRM_Core_PseudoConstant::individualPrefix(), $required
+          '' => ts('- select -')) + CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id'), $required
       );
     }
     elseif ($fieldName === 'individual_suffix') {
       $form->add('select', $name, $title,
         array(
-          '' => ts('- select -')) + CRM_Core_PseudoConstant::individualSuffix(), $required
+          '' => ts('- select -')) + CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id'), $required
       );
     }
     elseif ($fieldName === 'contact_sub_type') {

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 474be1d2de093768142b8b7fccb6a9985e05753b..42eb63d8525597e2b0dd36089c3a87e24d2da9d0 100644 (file)
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -98,20 +98,6 @@ class CRM_Core_PseudoConstant {
    */
   private static $component;
 
-  /**
-   * individual prefix
-   * @var array
-   * @static
-   */
-  private static $individualPrefix;
-
-  /**
-   * individual suffix
-   * @var array
-   * @static
-   */
-  private static $individualSuffix;
-
   /**
    * im protocols
    * @var array
@@ -724,27 +710,6 @@ class CRM_Core_PseudoConstant {
     return self::$component;
   }
 
-
-  /**
-   * Get all Individual Prefix.
-   *
-   * The static array individualPrefix is returned
-   *
-   * @access public
-   * @static
-   *
-   * @param boolean $all - get All Individual Prefix - default is to get only active ones.
-   *
-   * @return array - array reference of all individual prefix.
-   *
-   */
-  public static function &individualPrefix() {
-    if (!self::$individualPrefix) {
-      self::$individualPrefix = CRM_Core_OptionGroup::values('individual_prefix');
-    }
-    return self::$individualPrefix;
-  }
-
   /**
    * Get all phone type
    * The static array phoneType is returned
@@ -765,26 +730,6 @@ class CRM_Core_PseudoConstant {
     return self::$phoneType;
   }
 
-  /**
-   * Get all Individual Suffix.
-   *
-   * The static array individualSuffix is returned
-   *
-   * @access public
-   * @static
-   *
-   * @param boolean $all - get All Individual Suffix - default is to get only active ones.
-   *
-   * @return array - array reference of all individual suffix.
-   *
-   */
-  public static function &individualSuffix() {
-    if (!self::$individualSuffix) {
-      self::$individualSuffix = CRM_Core_OptionGroup::values('individual_suffix');
-    }
-    return self::$individualSuffix;
-  }
-
   /**
    * Get all the IM Providers from database.
    *

diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
index 534c278fd35ec3d24370f4375956921c65d68e82..bf6c39c58570e527968334c64e675d7cd015b7d4 100644 (file)
--- a/CRM/Event/BAO/Event.php
+++ b/CRM/Event/BAO/Event.php
@@ -1384,11 +1384,11 @@ WHERE civicrm_event.is_active = 1
           $values[$index] = $gender[$params[$name]];
         }
         elseif ('individual_prefix' == substr($name, 0, 17)) {
-          $prefix = CRM_Core_PseudoConstant::individualPrefix();
+          $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
           $values[$index] = $prefix[$params[$name]];
         }
         elseif ('individual_suffix' == substr($name, 0, 17)) {
-          $suffix = CRM_Core_PseudoConstant::individualSuffix();
+          $suffix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id');
           $values[$index] = $suffix[$params[$name]];
         }
         elseif (in_array($name, array(

diff --git a/CRM/Logging/Differ.php b/CRM/Logging/Differ.php
index 04d9a00b2604b7d51e36e74a997e2d61b2417c5e..e723280ffb7415c4bed551f5cec432047325a51f 100644 (file)
--- a/CRM/Logging/Differ.php
+++ b/CRM/Logging/Differ.php
@@ -240,10 +240,10 @@ WHERE log_conn_id = %1 AND
           'phone_type_id' => CRM_Core_PseudoConstant::phoneType(),
           'preferred_communication_method' => CRM_Core_PseudoConstant::pcm(),
           'preferred_language' => CRM_Core_PseudoConstant::languages(),
-          'prefix_id' => CRM_Core_PseudoConstant::individualPrefix(),
+          'prefix_id' => CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id'),
           'provider_id' => CRM_Core_PseudoConstant::IMProvider(),
           'state_province_id' => CRM_Core_PseudoConstant::stateProvince(),
-          'suffix_id' => CRM_Core_PseudoConstant::individualSuffix(),
+          'suffix_id' => CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id'),
           'website_type_id' => CRM_Core_PseudoConstant::websiteType(),
           'activity_type_id' => CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE),
           'case_type_id' => CRM_Case_PseudoConstant::caseType('label', FALSE),

diff --git a/CRM/Pledge/BAO/Pledge.php b/CRM/Pledge/BAO/Pledge.php
index e2bcc5ca384a01e0274e5d2a3390f31b5fd5faa6..565066442070858dde61896334497b03da0ee8c6 100644 (file)
--- a/CRM/Pledge/BAO/Pledge.php
+++ b/CRM/Pledge/BAO/Pledge.php
@@ -547,7 +547,7 @@ GROUP BY  currency
       )
     ) {
       $honor_block_is_active = TRUE;
-      $prefix = CRM_Core_PseudoConstant::individualPrefix();
+      $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
       $honor = CRM_Core_PseudoConstant::honor();
       $form->assign('honor_type', $honor[$params['honor_type_id']]);
       $form->assign('honor_prefix', $prefix[$params['honor_prefix_id']]);

diff --git a/CRM/Utils/DeprecatedUtils.php b/CRM/Utils/DeprecatedUtils.php
index 143ca2725fe36f7612e14c841cce29a6a7621cfe..78182f12b3a43e14f104c4e181ccd85f8adfa94b 100644 (file)
--- a/CRM/Utils/DeprecatedUtils.php
+++ b/CRM/Utils/DeprecatedUtils.php
@@ -797,7 +797,7 @@ function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params) {
   if (isset($values['individual_prefix'])) {
     if (CRM_Utils_Array::value('prefix_id', $params)) {
       $prefixes         = array();
-      $prefixes         = CRM_Core_PseudoConstant::individualPrefix();
+      $prefixes         = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
       $params['prefix'] = $prefixes[$params['prefix_id']];
     }
     else {
@@ -809,7 +809,7 @@ function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params) {
   if (isset($values['individual_suffix'])) {
     if (CRM_Utils_Array::value('suffix_id', $params)) {
       $suffixes         = array();
-      $suffixes         = CRM_Core_PseudoConstant::individualSuffix();
+      $suffixes         = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id');
       $params['suffix'] = $suffixes[$params['suffix_id']];
     }
     else {

diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index bab650d5d8a84cb471e79f962af0a86e24c808e0..48fd7301de048a998c97e2101579df2803d1d1e3 100644 (file)
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -86,11 +86,11 @@ function civicrm_api3_contact_create($params) {
   }
 
   if (isset($params['suffix_id']) && !(is_numeric($params['suffix_id']))) {
-    $params['suffix_id'] = array_search($params['suffix_id'], CRM_Core_PseudoConstant::individualSuffix());
+    $params['suffix_id'] = array_search($params['suffix_id'], CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id'));
   }
 
   if (isset($params['prefix_id']) && !(is_numeric($params['prefix_id']))) {
-    $params['prefix_id'] = array_search($params['prefix_id'], CRM_Core_PseudoConstant::individualPrefix());
+    $params['prefix_id'] = array_search($params['prefix_id'], CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id'));
   }
 
   if (isset($params['gender_id']) && !(is_numeric($params['gender_id']))) {

diff --git a/tests/phpunit/CRM/Contact/BAO/ContactTest.php b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
index 582e7028b7ee638763b0178b3963d4f9a1e578db..8ef1f453c9cf8ef84c73d4ac525efcee16843446 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
@@ -524,9 +524,9 @@ class CRM_Contact_BAO_ContactTest extends CiviUnitTestCase {
     //check the resolve values.
     $genders = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id');
     $this->assertEquals($genders[$params['gender_id']], $params['gender'], 'Check for gender.');
-    $prefix = CRM_Core_PseudoConstant::individualPrefix();
+    $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
     $this->assertEquals($prefix[$params['prefix_id']], $params['prefix'], 'Check for prefix.');
-    $suffix = CRM_Core_PseudoConstant::individualSuffix();
+    $suffix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id');
     $this->assertEquals($suffix[$params['suffix_id']], $params['suffix'], 'Check for suffix.');
     $this->assertEquals(CRM_Core_PseudoConstant::stateProvince($params['address'][1]['state_province_id']),
       $params['address'][1]['state_province'],
@@ -1266,8 +1266,8 @@ class CRM_Contact_BAO_ContactTest extends CiviUnitTestCase {
     //get display name.
     $dbDisplayName = CRM_Contact_BAO_Contact::displayName($contactId);
 
-    $prefix = CRM_Core_PseudoConstant::individualPrefix();
-    $suffix = CRM_Core_PseudoConstant::individualSuffix();
+    $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
+    $suffix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id');
 
     //build display name
     $paramsDisplayName = $prefix[$params['prefix_id']] . ' ' . $params['first_name'] . ' ' . $params['last_name'] . ' ' . $suffix[$params['suffix_id']];
@@ -1296,8 +1296,8 @@ class CRM_Contact_BAO_ContactTest extends CiviUnitTestCase {
 
     $checkImage = CRM_Contact_BAO_Contact_Utils::getImage($params['contact_type'], FALSE, $contactId);
 
-    $prefix = CRM_Core_PseudoConstant::individualPrefix();
-    $suffix = CRM_Core_PseudoConstant::individualSuffix();
+    $prefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
+    $suffix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id');
 
     //build display name
     $paramsDisplayName = $prefix[$params['prefix_id']] . ' ' . $params['first_name'] . ' ' . $params['last_name'] . ' ' . $suffix[$params['suffix_id']];

diff --git a/tools/bin/scripts/updateNameCache.php b/tools/bin/scripts/updateNameCache.php
index 3b573916e9b02838c929c07006aa4fe273211b35..a11061610535f438b72bdab41186febcbe770f97 100644 (file)
--- a/tools/bin/scripts/updateNameCache.php
+++ b/tools/bin/scripts/updateNameCache.php
@@ -71,8 +71,8 @@ class CRM_UpdateNameCache {
     $query = "SELECT * FROM civicrm_contact WHERE contact_type = 'Individual';";
     $dao = CRM_Core_DAO::executeQuery($query);
 
-    $prefixes = CRM_Core_PseudoConstant::individualPrefix();
-    $suffixes = CRM_Core_PseudoConstant::individualSuffix();
+    $prefixes = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
+    $suffixes = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id');
 
     $tokens = array();
     CRM_Utils_Hook::tokens($tokens);