X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FOptionGroup.php;h=596450b398456d742896ed6f1e3ec062f351590b;hb=b6e6000818a3bc99d2292cb50ea8470e85bff7de;hp=aeb793693f3ed86fc1a37cd06c2ab0dad1274280;hpb=c6e262c51134924a9cc023dcb0613238fd1d0451;p=civicrm-core.git diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php index aeb793693f..596450b398 100644 --- a/CRM/Core/OptionGroup.php +++ b/CRM/Core/OptionGroup.php @@ -36,7 +36,7 @@ class CRM_Core_OptionGroup { static $_values = array(); static $_cache = array(); - /* + /** * $_domainIDGroups array maintains the list of option groups for whom * domainID is to be considered. */ @@ -113,7 +113,6 @@ class CRM_Core_OptionGroup { * * @return array * the values as specified by the above params - * @static * @void */ static function &values( @@ -219,8 +218,7 @@ WHERE v.option_group_id = g.id * @param bool $fresh * * @return array - * of values as specified by the above params - * @static + * Array of values as specified by the above params * @void */ public static function &valuesByID($id, $flip = FALSE, $grouping = FALSE, $localize = FALSE, $labelColumnName = 'label', $onlyActive = TRUE, $fresh = FALSE) { @@ -277,7 +275,6 @@ WHERE v.option_group_id = g.id * * @return void * - * @static */ public static function lookupValues(&$params, &$names, $flip = FALSE) { foreach ($names as $postName => $value) { @@ -418,7 +415,6 @@ WHERE v.option_group_id = g.id * @param string $groupName * The name of the option group. * - * @static * * @return string * the value from the row where is_default = true @@ -467,7 +463,6 @@ WHERE v.option_group_id = g.id * @param null $groupTitle * The optional label of the option group else set to group name. * - * @static * * @return int * the option group ID @@ -639,7 +634,7 @@ WHERE v.option_group_id = g.id return $row; } - /* + /** * Wrapper for calling values with fresh set to true to empty the given value * * Since there appears to be some inconsistency @@ -647,9 +642,8 @@ WHERE v.option_group_id = g.id * (for example CRM_Contribution_Pseudoconstant::paymentInstrument doesn't specify isActive * which is part of the cache key * will do a couple of variations & aspire to someone cleaning it up later - */ - /** - * @param $name + * + * @param string $name * @param array $params */ public static function flush($name, $params = array()) {