Merge pull request #4955 from atif-shaikh/master-cleanup

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

diff --git a/CRM/Mailing/PseudoConstant.php b/CRM/Mailing/PseudoConstant.php
index 2e254b45e87464aa710a811f16fcdd13f62d886a..d38864c95b873288b0152ac432d79582aa4663c8 100644 (file)
--- a/CRM/Mailing/PseudoConstant.php
+++ b/CRM/Mailing/PseudoConstant.php
@@ -42,21 +42,18 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
   /**
    * Mailing templates
    * @var array
-   * @static
    */
   private static $template;
 
   /**
    * Completed mailings
    * @var array
-   * @static
    */
   private static $completed;
 
   /**
    * Mailing components
    * @var array
-   * @static
    */
   private static $component;
 
@@ -73,7 +70,6 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
    *
    * @return array
    *   array reference of all mailing components
-   * @static
    */
   public static function &component($type = NULL) {
     $name = $type ? $type : 'ALL';
@@ -113,9 +109,8 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
    * @param $undefined
    *   The value to use if no default is defined.
    *
-   * @return integer
+   * @return int
    *   The ID of the default mailing component.
-   * @static
    */
   public static function &defaultComponent($type, $undefined = NULL) {
     if (!self::$defaultComponent) {
@@ -142,7 +137,6 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
    *
    * @return array
    *   array reference of all mailing templates if any
-   * @static
    */
   public static function &template() {
     if (!self::$template) {
@@ -159,7 +153,6 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
    *
    * @return array
    *   array reference of all mailing templates if any
-   * @static
    */
   public static function &completed($mode = NULL) {
     if (!self::$completed) {
@@ -190,23 +183,23 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
       $options = array(
         'bounce' => array(
           'N' => ts('Successful '),
-      'Y' => ts('Bounced '),
+          'Y' => ts('Bounced '),
         ),
         'delivered' => array(
           'Y' => ts('Successful '),
-      'N' => ts('Bounced '),
+          'N' => ts('Bounced '),
         ),
         'open' => array(
           'Y' => ts('Opened '),
-      'N' => ts('Unopened/Hidden '),
+          'N' => ts('Unopened/Hidden '),
         ),
         'click' => array(
           'Y' => ts('Clicked '),
-      'N' => ts('Not Clicked '),
+          'N' => ts('Not Clicked '),
         ),
         'reply' => array(
           'Y' => ts('Replied '),
-      'N' => ts('No Reply '),
+          'N' => ts('No Reply '),
         ),
       );
     }
@@ -217,7 +210,6 @@ class CRM_Mailing_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
    */