Merge branch 4.5 into 4.6

[civicrm-core.git] / CRM / Mailing / BAO / BouncePattern.php

diff --git a/CRM/Mailing/BAO/BouncePattern.php b/CRM/Mailing/BAO/BouncePattern.php
index 7ccad8395fd1c91c4b59723fcfec8f2c464ffb5d..d9432dab3eb7f1696740ff710b4d83d129e0b85e 100644 (file)
--- a/CRM/Mailing/BAO/BouncePattern.php
+++ b/CRM/Mailing/BAO/BouncePattern.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -40,17 +40,16 @@ class CRM_Mailing_BAO_BouncePattern extends CRM_Mailing_DAO_BouncePattern {
   static $_patterns = NULL;
 
   /**
-   * Class constructor
+   * Class constructor.
    */
   public function __construct() {
     parent::__construct();
   }
 
   /**
-   * Build the static pattern array
+   * Build the static pattern array.
    *
    * @return void
-   * @static
    */
   public static function buildPatterns() {
     self::$_patterns = array();
@@ -74,10 +73,11 @@ class CRM_Mailing_BAO_BouncePattern extends CRM_Mailing_DAO_BouncePattern {
   /**
    * Try to match the string to a bounce type.
    *
-   * @param string $message       The message to be matched
+   * @param string $message
+   *   The message to be matched.
    *
-   * @return array                Tuple (bounce_type, bounce_reason)
-   * @static
+   * @return array
+   *   Tuple (bounce_type, bounce_reason)
    */
   public static function &match(&$message) {
     // clean up $message and replace all white space by a single space, CRM-4767
@@ -104,4 +104,5 @@ class CRM_Mailing_BAO_BouncePattern extends CRM_Mailing_DAO_BouncePattern {
 
     return $bounce;
   }
+
 }