X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FReport%2FUtils%2FGet.php;h=fe0b9507c2da0d53cfbb41687d965f8ab66bb111;hb=96025800fa500fbbd71288fa1b0bc459f17c5bcc;hp=cad6f333e7563cf5abb489d508ef9a2e96a76b2d;hpb=24f8127938dec80960d388e50fd5b89aa450b494;p=civicrm-core.git

diff --git a/CRM/Report/Utils/Get.php b/CRM/Report/Utils/Get.php
index cad6f333e7..fe0b9507c2 100644
--- a/CRM/Report/Utils/Get.php
+++ b/CRM/Report/Utils/Get.php
@@ -1,8 +1,7 @@
 <?php
-
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -36,12 +35,12 @@
 class CRM_Report_Utils_Get {
 
   /**
-   * @param $name
+   * @param string $name
    * @param $type
    *
    * @return mixed|null
    */
-  static function getTypedValue($name, $type) {
+  public static function getTypedValue($name, $type) {
     $value = CRM_Utils_Array::value($name, $_GET);
     if ($value === NULL) {
       return NULL;
@@ -53,11 +52,11 @@ class CRM_Report_Utils_Get {
   }
 
   /**
-   * @param $fieldName
+   * @param string $fieldName
    * @param $field
    * @param $defaults
    */
-  static function dateParam($fieldName, &$field, &$defaults) {
+  public static function dateParam($fieldName, &$field, &$defaults) {
     // type = 12 (datetime) is not recognized by Utils_Type::escape() method,
     // and therefore the below hack
     $type = 4;
@@ -96,11 +95,11 @@ class CRM_Report_Utils_Get {
   }
 
   /**
-   * @param $fieldName
+   * @param string $fieldName
    * @param $field
    * @param $defaults
    */
-  static function stringParam($fieldName, &$field, &$defaults) {
+  public static function stringParam($fieldName, &$field, &$defaults) {
     $fieldOP = CRM_Utils_Array::value("{$fieldName}_op", $_GET, 'like');
 
     switch ($fieldOP) {
@@ -121,6 +120,7 @@ class CRM_Report_Utils_Get {
       case 'nnll':
         $defaults["{$fieldName}_op"] = $fieldOP;
         break;
+
       case 'in':
       case 'notin':
       case 'mhas':
@@ -134,11 +134,11 @@ class CRM_Report_Utils_Get {
   }
 
   /**
-   * @param $fieldName
+   * @param string $fieldName
    * @param $field
    * @param $defaults
    */
-  static function intParam($fieldName, &$field, &$defaults) {
+  public static function intParam($fieldName, &$field, &$defaults) {
     $fieldOP = CRM_Utils_Array::value("{$fieldName}_op", $_GET, 'eq');
 
     switch ($fieldOP) {
@@ -192,10 +192,12 @@ class CRM_Report_Utils_Get {
   /**
    * @param $defaults
    */
-  static function processChart(&$defaults) {
+  public static function processChart(&$defaults) {
     $chartType = CRM_Utils_Array::value("charts", $_GET);
     if (in_array($chartType, array(
-      'barChart', 'pieChart'))) {
+      'barChart',
+      'pieChart',
+    ))) {
       $defaults["charts"] = $chartType;
     }
   }
@@ -204,7 +206,7 @@ class CRM_Report_Utils_Get {
    * @param $fieldGrp
    * @param $defaults
    */
-  static function processFilter(&$fieldGrp, &$defaults) {
+  public static function processFilter(&$fieldGrp, &$defaults) {
     // process only filters for now
     foreach ($fieldGrp as $tableName => $fields) {
       foreach ($fields as $fieldName => $field) {
@@ -229,11 +231,11 @@ class CRM_Report_Utils_Get {
     }
   }
 
-  //unset default filters
   /**
+   * unset default filters
    * @param $defaults
    */
-  static function unsetFilters(&$defaults) {
+  public static function unsetFilters(&$defaults) {
     static $unsetFlag = TRUE;
     if ($unsetFlag) {
       foreach ($defaults as $field_name => $field_value) {
@@ -254,7 +256,7 @@ class CRM_Report_Utils_Get {
    * @param $fieldGrp
    * @param $defaults
    */
-  static function processGroupBy(&$fieldGrp, &$defaults) {
+  public static function processGroupBy(&$fieldGrp, &$defaults) {
     // process only group_bys for now
     $flag = FALSE;
 
@@ -282,7 +284,7 @@ class CRM_Report_Utils_Get {
    * @param $reportFields
    * @param $defaults
    */
-  static function processFields(&$reportFields, &$defaults) {
+  public static function processFields(&$reportFields, &$defaults) {
     //add filters from url
     if (is_array($reportFields)) {
       if ($urlFields = CRM_Utils_Array::value("fld", $_GET)) {
@@ -303,5 +305,5 @@ class CRM_Report_Utils_Get {
       }
     }
   }
-}
 
+}