Merge pull request #4607 from samuelsov/CRM-15637

[civicrm-core.git] / CRM / Bridge / OG / Drupal.php

diff --git a/CRM/Bridge/OG/Drupal.php b/CRM/Bridge/OG/Drupal.php
index 58c4cb83c99eca9941184fbb8cb9b0d6bafa5c91..fe963acbcb7879f5fba5314abb1f8a1e5cf1d95b 100644 (file)
--- a/CRM/Bridge/OG/Drupal.php
+++ b/CRM/Bridge/OG/Drupal.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -37,10 +37,10 @@
 class CRM_Bridge_OG_Drupal {
 
   /**
-   * @param $params
+   * @param array $params
    * @param $op
    */
-  static function nodeapi(&$params, $op) {
+  public static function nodeapi(&$params, $op) {
 
     $transaction = new CRM_Core_Transaction();
 
@@ -68,11 +68,11 @@ class CRM_Bridge_OG_Drupal {
   }
 
   /**
-   * @param $params
+   * @param array $params
    * @param $op
    * @param null $groupType
    */
-  static function updateCiviGroup(&$params, $op, $groupType = NULL) {
+  public static function updateCiviGroup(&$params, $op, $groupType = NULL) {
     $abort             = false;
     $params['version'] = 3;
     $params['id']      = CRM_Bridge_OG_Utils::groupID($params['source'], $params['title'], $abort);
@@ -98,10 +98,10 @@ class CRM_Bridge_OG_Drupal {
   }
 
   /**
-   * @param $aclParams
+   * @param array $aclParams
    * @param $op
    */
-  static function updateCiviACLTables($aclParams, $op) {
+  public static function updateCiviACLTables($aclParams, $op) {
     if ($op == 'delete') {
       self::updateCiviACL($aclParams, $op);
       self::updateCiviACLEntityRole($aclParams, $op);
@@ -115,10 +115,10 @@ class CRM_Bridge_OG_Drupal {
   }
 
   /**
-   * @param $params
+   * @param array $params
    * @param $op
    */
-  static function updateCiviACLRole(&$params, $op) {
+  public static function updateCiviACLRole(&$params, $op) {
 
     $optionGroupID = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionGroup',
       'acl_role',
@@ -162,10 +162,10 @@ SELECT v.id
   }
 
   /**
-   * @param $params
+   * @param array $params
    * @param $op
    */
-  static function updateCiviACLEntityRole(&$params, $op) {
+  public static function updateCiviACLEntityRole(&$params, $op) {
     $dao = new CRM_ACL_DAO_EntityRole();
 
     $dao->entity_table = 'civicrm_group';
@@ -184,10 +184,10 @@ SELECT v.id
   }
 
   /**
-   * @param $params
+   * @param array $params
    * @param $op
    */
-  static function updateCiviACL(&$params, $op) {
+  public static function updateCiviACL(&$params, $op) {
     $dao = new CRM_ACL_DAO_ACL();
 
     $dao->object_table = 'civicrm_saved_search';
@@ -210,12 +210,12 @@ SELECT v.id
   }
 
   /**
-   * @param $params
+   * @param array $params
    * @param $op
    *
    * @throws Exception
    */
-  static function og(&$params, $op) {
+  public static function og(&$params, $op) {
 
     $contactID = CRM_Bridge_OG_Utils::contactID($params['uf_id']);
     if (!$contactID) {
@@ -266,4 +266,3 @@ SELECT v.id
     }
   }
 }
-