Merge pull request #6356 from monishdeb/CRM-16931

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

diff --git a/CRM/Campaign/PseudoConstant.php b/CRM/Campaign/PseudoConstant.php
index 7572f3955880fbc7c1976a38dcc3232d5cb7200a..d436be98021c2cd3f2755c03234cf3649d7ca5f9 100755 (executable)
--- a/CRM/Campaign/PseudoConstant.php
+++ b/CRM/Campaign/PseudoConstant.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -42,27 +42,23 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant {
   /**
    * Activity types
    * @var array
-   * @static
    */
   private static $activityType;
 
   /**
    * Campaign Type
    * @var array
-   * @static
    */
   private static $campaignType = array();
 
   /**
    * Campaign Status
    * @var array
-   * @static
    */
   private static $campaignStatus = array();
 
   /**
    * Engagement Level
-   * @static
    */
   private static $engagementLevel;
 
@@ -70,12 +66,11 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant {
    * DEPRECATED. Please use the buildOptions() method in the appropriate BAO object.
    * Get all the survey activity types
    *
-   * @access public
    *
    * @param string $returnColumn
    *
-   * @return array - array reference of all survey activity types.
-   * @static
+   * @return array
+   *   array reference of all survey activity types.
    */
   public static function &activityType($returnColumn = 'name') {
     $cacheKey = $returnColumn;
@@ -99,11 +94,9 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant {
    *
    * The static array campaignType is returned
    *
-   * @access public
-   * @static
-   *
-   * @return array - array reference of all campaign types.
    *
+   * @return array
+   *   array reference of all campaign types.
    */
   public static function &campaignType() {
     if (!self::$campaignType) {
@@ -119,11 +112,9 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant {
    *
    * The static array campaignStatus is returned
    *
-   * @access public
-   * @static
-   *
-   * @return array - array reference of all campaign status.
    *
+   * @return array
+   *   array reference of all campaign status.
    */
   public static function &campaignStatus() {
     if (!self::$campaignStatus) {
@@ -139,10 +130,9 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant {
    *
    * The static array Engagement Level is returned
    *
-   * @access public
-   * @static
    *
-   * @return array - array reference of all Engagement Level.
+   * @return array
+   *   array reference of all Engagement Level.
    */
   public static function &engagementLevel() {
     if (!isset(self::$engagementLevel)) {
@@ -156,15 +146,13 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant {
    * Flush given pseudoconstant so it can be reread from db
    * next time it's requested.
    *
-   * @access public
-   * @static
    *
    * @param bool|string $name pseudoconstant to be flushed
    */
   public static function flush($name = 'cache') {
-   if (isset(self::$$name)) {
+    if (isset(self::$$name)) {
       self::$$name = NULL;
     }
   }
-}
 
+}