Merge pull request #2436 from eileenmcnaughton/test-fix

Test fix

CRM/Contact/BAO/Group.php

@@ -676,7 +676,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
    * @return array   $groupList associated array of group list
    * @access public
    */
-  public function getGroupListSelector(&$params) {
+  static public function getGroupListSelector(&$params) {
     // format the params
     $params['offset']   = ($params['page'] - 1) * $params['rp'];
     $params['rowCount'] = $params['rp'];
@@ -1043,7 +1043,7 @@ WHERE {$whereClause}";
     return CRM_Core_DAO::singleValueQuery($query, $params);
   }
 
-  function whereClause(&$params, $sortBy = TRUE, $excludeHidden = TRUE) {
+  static function whereClause(&$params, $sortBy = TRUE, $excludeHidden = TRUE) {
     $values = array();
     $clauses = array();
 

tests/phpunit/api/v3/GroupContactTest.php

@@ -53,7 +53,7 @@ class api_v3_GroupContactTest extends CiviUnitTestCase {
 
     $this->_contactId = $this->individualCreate();
 
-    $this->_groupId1 = $this->groupCreate(NULL);
+    $this->_groupId1 = $this->groupCreate();
     $params = array(
       'contact_id' => $this->_contactId,
       'group_id' => $this->_groupId1,