Merge branch 'master' into findById

[civicrm-core.git] / CRM / Case / XMLProcessor / Report.php

diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php
index 13d40f6f52e20d9c5e1cb698906866b95892ab72..2105db507275af6d7442410e3fde532472490757 100644 (file)
--- a/CRM/Case/XMLProcessor/Report.php
+++ b/CRM/Case/XMLProcessor/Report.php
@@ -47,10 +47,10 @@ class CRM_Case_XMLProcessor_Report extends CRM_Case_XMLProcessor {
   public function __construct() {}
 
   /**
-   * @param $clientID
-   * @param $caseID
-   * @param $activitySetName
-   * @param $params
+   * @param int $clientID
+   * @param int $caseID
+   * @param string $activitySetName
+   * @param array $params
    *
    * @return mixed
    */
@@ -89,8 +89,8 @@ class CRM_Case_XMLProcessor_Report extends CRM_Case_XMLProcessor {
   }
 
   /**
-   * @param $clientID
-   * @param $caseID
+   * @param int $clientID
+   * @param int $caseID
    *
    * @return array
    */
@@ -148,7 +148,7 @@ class CRM_Case_XMLProcessor_Report extends CRM_Case_XMLProcessor {
 
   /**
    * @param $xml
-   * @param $activitySetName
+   * @param string $activitySetName
    *
    * @return array|bool
    */
@@ -176,7 +176,7 @@ class CRM_Case_XMLProcessor_Report extends CRM_Case_XMLProcessor {
 
   /**
    * @param $xml
-   * @param $activitySetName
+   * @param string $activitySetName
    *
    * @return null|string
    */
@@ -192,8 +192,8 @@ class CRM_Case_XMLProcessor_Report extends CRM_Case_XMLProcessor {
   }
 
   /**
-   * @param $clientID
-   * @param $caseID
+   * @param int $clientID
+   * @param int $caseID
    * @param $activityTypes
    * @param $activities
    */
@@ -236,8 +236,8 @@ AND    ac.case_id = %1
   }
 
   /**
-   * @param $clientID
-   * @param $activityID
+   * @param int $clientID
+   * @param int $activityID
    * @param bool $anyActivity
    * @param int $redact
    *
@@ -305,7 +305,7 @@ WHERE      a.id = %1
   }
 
   /**
-   * @param $clientID
+   * @param int $clientID
    * @param $activityDAO
    * @param $activityTypeInfo
    *
@@ -466,7 +466,7 @@ WHERE      a.id = %1
       }
       $assigneeContacts = implode(', ', $assignee_contact_names);
       $activity['fields'][] = array(
-        'label' => ts('Assigned To'),
+        'label' => ts('Assigned to'),
         'value' => $assigneeContacts,
         'type' => 'String',
       );
@@ -534,7 +534,7 @@ WHERE      a.id = %1
   }
 
   /**
-   * @param $clientID
+   * @param int $clientID
    * @param $activityDAO
    * @param $activityTypeInfo
    *
@@ -594,7 +594,7 @@ WHERE      a.id = %1
   }
 
   /**
-   * @param $activityTypeID
+   * @param int $activityTypeID
    * @param null $dateFormat
    *
    * @return mixed
@@ -628,7 +628,7 @@ AND    cg.extends = 'Activity'";
       else {
         $query .= "AND cg.extends_entity_column_value IS NULL";
       }
-      $query .= "ORDER BY cf.weight";
+      $query .= "ORDER BY cg.weight, cf.weight";
       $params = array(
         1 => array($activityTypeID,
           'Integer',
@@ -696,7 +696,7 @@ WHERE  entity_id = %1
   }
 
   /**
-   * @param $activityID
+   * @param int $activityID
    *
    * @return null|string
    */
@@ -722,8 +722,7 @@ LIMIT  1
    *
    * @return mixed
    */
-  private function redact($string, $printReport = FALSE, $replaceString = array(
-    )) {
+  private function redact($string, $printReport = FALSE, $replaceString = array()) {
     if ($printReport) {
       return CRM_Utils_String::redaction($string, $replaceString);
     }
@@ -735,11 +734,11 @@ LIMIT  1
   }
 
   /**
-   * @param $clientID
-   * @param $caseID
-   * @param $activitySetName
-   * @param $params
-   * @param $form
+   * @param int $clientID
+   * @param int $caseID
+   * @param string $activitySetName
+   * @param array $params
+   * @param CRM_Core_Form $form
    *
    * @return mixed
    */