Merge pull request #4977 from colemanw/CRM-15812

[civicrm-core.git] / CRM / Case / PseudoConstant.php

diff --git a/CRM/Case/PseudoConstant.php b/CRM/Case/PseudoConstant.php
index d22e4d85240aee08b3cba019643ea35d534bccbd..8b45a10986addcfe9d90ffcc00ad39fb640a9154 100644 (file)
--- a/CRM/Case/PseudoConstant.php
+++ b/CRM/Case/PseudoConstant.php
@@ -42,35 +42,30 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
   /**
    * Case statues
    * @var array
-   * @static
    */
   static $caseStatus = array();
 
   /**
    * Redaction rules
    * @var array
-   * @static
    */
   static $redactionRule;
 
   /**
    * Case type
    * @var array
-   * @static
    */
   static $caseType = array();
 
   /**
    * Encounter Medium
    * @var array
-   * @static
    */
   static $encounterMedium = array();
 
   /**
    * Activity type
    * @var array
-   * @static
    */
   static $activityTypeList = array();
 
@@ -83,8 +78,8 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
    * @param null $condition
    * @param bool $fresh
    *
-   * @return array - array reference of all case statues
-   * @static
+   * @return array
+   *   array reference of all case statues
    */
   public static function caseStatus($column = 'label', $onlyActive = TRUE, $condition = NULL, $fresh = FALSE) {
     $cacheKey = "{$column}_" . (int) $onlyActive;
@@ -108,10 +103,9 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
    *
    * @param null $filter
    *
-   * @return array - array reference of all redaction rules
-   * @static
+   * @return array
+   *   array reference of all redaction rules
    */
-
   public static function redactionRule($filter = NULL) {
     // if ( ! self::$redactionRule ) {
     self::$redactionRule = array();
@@ -138,13 +132,14 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
    * @param string $column
    * @param bool $onlyActive
    *
-   * @return array - array reference of all case type
-   * @static
+   * @return array
+   *   array reference of all case type
    */
   public static function caseType($column = 'title', $onlyActive = TRUE) {
     if ($onlyActive) {
       $condition = " is_active = 1 ";
-    } else {
+    }
+    else {
       $condition = NULL;
     }
     $caseType = NULL;
@@ -170,8 +165,8 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
    * @param string $column
    * @param bool $onlyActive
    *
-   * @return array - array reference of all Encounter Medium.
-   * @static
+   * @return array
+   *   array reference of all Encounter Medium.
    */
   public static function encounterMedium($column = 'label', $onlyActive = TRUE) {
     $cacheKey = "{$column}_" . (int) $onlyActive;
@@ -186,19 +181,19 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
   }
 
   /**
-   * Get all Activty types for the CiviCase component
+   * Get all Activity types for the CiviCase component
    *
    * The static array activityType is returned
    *
    * @param bool $indexName
    *   True return activity name in array.
-   * key else activity id as array key.
+   *   key else activity id as array key.
    *
    * @param bool $all
    *
-   * @static
    *
-   * @return array - array reference of all activity types.
+   * @return array
+   *   array reference of all activity types.
    */
   public static function &caseActivityType($indexName = TRUE, $all = FALSE) {
     $cache = (int) $indexName . '_' . (int) $all;
@@ -250,7 +245,6 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
    * Flush given pseudoconstant so it can be reread from db
    * next time it's requested.
    *
-   * @static
    *
    * @param bool|string $name pseudoconstant to be flushed
    */