Merge pull request #4687 from eileenmcnaughton/CRM-15699-master

[civicrm-core.git] / CRM / Event / BAO / Query.php

diff --git a/CRM/Event/BAO/Query.php b/CRM/Event/BAO/Query.php
index a3379d942ef143b232dd5f0c690a07927956fa73..376d3062e0cd8217903ffe1315093911beabe916 100644 (file)
--- a/CRM/Event/BAO/Query.php
+++ b/CRM/Event/BAO/Query.php
@@ -56,7 +56,7 @@ class CRM_Event_BAO_Query {
   }
 
   /**
-   * build select for CiviEvent
+   * Build select for CiviEvent
    *
    * @param $query
    *
@@ -206,7 +206,7 @@ class CRM_Event_BAO_Query {
       }
     }
   }
-  
+
 
   /**
    * @param $query
@@ -249,14 +249,14 @@ class CRM_Event_BAO_Query {
           'civicrm_event', 'event_end_date', 'end_date', 'End Date'
         );
         return;
-        
+
       case 'event_id':
         $query->_where[$grouping][] = "civicrm_event.id $op {$value}";
         $eventTitle = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $value, 'title');
         $query->_qill[$grouping][] = ts('Event') . " $op {$eventTitle}";
         $query->_tables['civicrm_event'] = $query->_whereTables['civicrm_event'] = 1;
         return;
-        
+
       case 'event_include_repeating_events':
         /**
          * Include Repeating Events
@@ -292,7 +292,7 @@ class CRM_Event_BAO_Query {
         $query->_qill[$grouping][] = ts('Include Repeating Events (If Any) ') . " = TRUE";
         $query->_tables['civicrm_event'] = $query->_whereTables['civicrm_event'] = 1;
         return;
-       
+
       case 'event_type_id':
 
         $eventTypes = CRM_Core_OptionGroup::values("event_type");
@@ -300,7 +300,7 @@ class CRM_Event_BAO_Query {
         $query->_qill[$grouping][] = ts('Event Type - %1', array(1 => $eventTypes[$value]));
         $query->_tables['civicrm_event'] = $query->_whereTables['civicrm_event'] = 1;
         return;
-        
+
       case 'participant_test':
         // We dont want to include all tests for sql OR CRM-7827
         if (!$value || $query->getOperator() != 'OR') {
@@ -454,11 +454,7 @@ class CRM_Event_BAO_Query {
         return;
 
       case 'participant_id':
-        $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause("civicrm_participant.id",
-          $op,
-          $value,
-          "Integer"
-        );
+        $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause("civicrm_participant.id", $op, $value, "Integer");
         $query->_tables['civicrm_participant'] = $query->_whereTables['civicrm_participant'] = 1;
         return;
 
@@ -504,7 +500,7 @@ class CRM_Event_BAO_Query {
   }
 
   /**
-   * @param $name
+   * @param string $name
    * @param $mode
    * @param $side
    *
@@ -550,7 +546,7 @@ class CRM_Event_BAO_Query {
   }
 
   /**
-   * getter for the qill object
+   * Getter for the qill object
    *
    * @return string
    * @access public
@@ -676,14 +672,14 @@ class CRM_Event_BAO_Query {
     }
 
     CRM_Campaign_BAO_Campaign::addCampaignInComponentSearch($form, 'participant_campaign_id');
-    
+
     $form->assign('validCiviEvent', TRUE);
     $form->setDefaults(array('participant_test' => 0));
   }
 
   /**
    * @param $row
-   * @param $id
+   * @param int $id
    */
   static function searchAction(&$row, $id) {}