Merge branch 4.5 into master

[civicrm-core.git] / CRM / Utils / Tree.php

diff --git a/CRM/Utils/Tree.php b/CRM/Utils/Tree.php
index 3996676473f6c4db75fe689738ea5781259e78c2..19ecf80bf29620a00fffc7a53f8a0a32cb3bb37e 100644 (file)
--- a/CRM/Utils/Tree.php
+++ b/CRM/Utils/Tree.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -105,14 +105,12 @@ class CRM_Utils_Tree {
   /**
    * Find a node that matches the given string
    *
-   * @param string      $name       name of the node we are searching for.
+   * @param string $name
+   *   Name of the node we are searching for.
    * @param array (ref) $parentNode which parent node should we search in ?
    *
-   * @return array(
-     ref) | false node if found else false
-   *
+   * @return array(ref) | false node if found else false
    */
-  //public function &findNode(&$parentNode, $name)
   public function &findNode($name, &$parentNode) {
     // if no parent node specified, please start from root node
     if (!$parentNode) {
@@ -146,11 +144,9 @@ class CRM_Utils_Tree {
    * Check if node is a leaf node.
    * Currently leaf nodes are strings and non-leaf nodes are arrays
    *
-   * @param array(
-     ref) $node node which needs to checked
-   *
-   * @return boolean
+   * @param array $node node which needs to checked
    *
+   * @return bool
    */
   public function isLeafNode(&$node) {
     return (count($node['children']) ? TRUE : FALSE);
@@ -161,13 +157,13 @@ class CRM_Utils_Tree {
    *
    * @param string $name
    *
-   * @return array (ref)
-   *
+   * @return array
+   *   (ref)
    */
   public function &createNode($name) {
-    $node['name']     = $name;
+    $node['name'] = $name;
     $node['children'] = array();
-    $node['data']     = array();
+    $node['data'] = array();
 
     return $node;
   }
@@ -175,11 +171,11 @@ class CRM_Utils_Tree {
   /**
    * Add node
    *
-   * @param string $parentName - name of the parent ?
-   * @param array  (ref)       - node to be added
+   * @param string $parentName
+   *   Name of the parent ?.
+   * @param array (ref) $node - node to be added
    *
    * @return void
-   *
    */
   public function addNode($parentName, &$node) {
     $temp = '';
@@ -191,12 +187,11 @@ class CRM_Utils_Tree {
   /**
    * Add Data
    *
-   * @param string $parentName - name of the parent ?
-   * @param mixed              - data to be added
-   * @param string             - key to be used (optional)
+   * @param string $parentName Name of the parent ?.
+   * @param string $childName - key to be used (optional)
+   * @param mixed $data - data to be added
    *
    * @return void
-   *
    */
   public function addData($parentName, $childName, $data) {
     $temp = '';
@@ -213,10 +208,7 @@ class CRM_Utils_Tree {
   /**
    * Get Tree
    *
-   * @param none
-   *
    * @return tree
-   *
    */
   public function getTree() {
     return $this->tree;
@@ -225,12 +217,10 @@ class CRM_Utils_Tree {
   /**
    * Print the tree
    *
-   * @param none
-   *
    * @return void
-   *
    */
   public function display() {
     print_r($this->tree);
   }
+
 }