From ba3228d18a8e6279f7c2ea80393f3eabd2d14e55 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 5 Jan 2015 19:07:25 +1300
Subject: [PATCH] minor tidyups

---
 CRM/Case/BAO/CaseType.php    |  2 +-
 CRM/Core/ManagedEntities.php |  4 +++-
 CRM/Core/Transaction.php     | 11 ++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CRM/Case/BAO/CaseType.php b/CRM/Case/BAO/CaseType.php
index 9a7300beae..b629beaa7f 100644
--- a/CRM/Case/BAO/CaseType.php
+++ b/CRM/Case/BAO/CaseType.php
@@ -80,7 +80,7 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType {
     // function to format definition column
     if (isset($params['definition']) && is_array($params['definition'])) {
       $params['definition'] = self::convertDefinitionToXML($caseTypeName, $params['definition']);
-      CRM_Core_ManagedEntities::scheduleReconcilation();
+      CRM_Core_ManagedEntities::scheduleReconciliation();
     }
 
     $caseTypeDAO->copyValues($params);
diff --git a/CRM/Core/ManagedEntities.php b/CRM/Core/ManagedEntities.php
index 98fe3b0fef..d8b3361b2b 100644
--- a/CRM/Core/ManagedEntities.php
+++ b/CRM/Core/ManagedEntities.php
@@ -27,6 +27,8 @@ class CRM_Core_ManagedEntities {
 
   /**
    * Get an instance
+   * @param bool $fresh
+   * @return \CRM_Core_ManagedEntities
    */
   public static function singleton($fresh = FALSE) {
     static $singleton;
@@ -39,7 +41,7 @@ class CRM_Core_ManagedEntities {
   /**
    * Perform an asynchronous reconciliation when the transaction ends.
    */
-  public static function scheduleReconcilation() {
+  public static function scheduleReconciliation() {
     CRM_Core_Transaction::addCallback(
       CRM_Core_Transaction::PHASE_POST_COMMIT,
       function () {
diff --git a/CRM/Core/Transaction.php b/CRM/Core/Transaction.php
index 36d841aad1..e1a0d645f9 100644
--- a/CRM/Core/Transaction.php
+++ b/CRM/Core/Transaction.php
@@ -156,7 +156,7 @@ class CRM_Core_Transaction {
    * Mark the transaction for rollback.
    *
    * (Note: Prior to 4.6, return void)
-   * @return \CRM_Core_Exception this
+   * @return \CRM_Core_Transaction
    */
   public function rollback() {
     $frame = \Civi\Core\Transaction\Manager::singleton()->getFrame();
@@ -173,8 +173,8 @@ class CRM_Core_Transaction {
    * After calling run(), the CRM_Core_Transaction object is "used up"; do not
    * use it again.
    *
-   * @param mixed $callable Should exception one paramter (CRM_Core_Transaction $tx)
-   * @return \CRM_Core_Exception this
+   * @param string $callable Should exception one paramter (CRM_Core_Transaction $tx)
+   * @return CRM_Core_Transaction
    * @throws Exception
    */
   public function run($callable) {
@@ -233,10 +233,11 @@ class CRM_Core_Transaction {
    *
    * Pre-condition: isActive()
    *
-   * @param $phase A constant; one of: self::PHASE_{PRE,POST}_{COMMIT,ROLLBACK}
-   * @param $callback A PHP callback
+   * @param int $phase A constant; one of: self::PHASE_{PRE,POST}_{COMMIT,ROLLBACK}
+   * @param string $callback A PHP callback
    * @param mixed $params Optional values to pass to callback.
    *          See php manual call_user_func_array for details.
+   * @param int $id
    */
   static public function addCallback($phase, $callback, $params = null, $id = NULL) {
     $frame = \Civi\Core\Transaction\Manager::singleton()->getBaseFrame();
-- 
2.25.1